Modeling: Move package content definition from feature to product

By using the product definition (instead of the EPP package feature) for
defining the product content it is possible to install some of them as
root level feature that can be updated and/or removed independently from
the package.

The features o.e.emf.ecoretools.design o.e.emf.eef.codegen.ecore-feature
are defined including a version number; this should be revised if it is
still necessary and wanted.

Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989

Change-Id: Iaa2d57ce0f26e0624241952a169ee2ff0a579676
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>

2 files changed, 43 insertions, 34 deletions

diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index d7cbb4db..ff867c8e 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -26,40 +26,14 @@
          search-location="both"/>
 
    <requires>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.pde"/>
-      <import feature="org.eclipse.sdk"/>
-      <import feature="org.eclipse.e4.core.tools.feature"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.java_feature"/>
-      <import feature="org.eclipse.mylyn.pde_feature"/>
-      <import feature="org.eclipse.mylyn.bugzilla_feature"/>
-      <import feature="org.eclipse.mylyn.context_feature"/>
-      <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
-      <import feature="org.eclipse.emf.sdk"/>
-      <import feature="org.eclipse.gef.sdk"/>
-      <import feature="org.eclipse.uml2.sdk"/>
-      <import feature="org.eclipse.ocl.all.sdk"/>
-      <import feature="org.eclipse.emf.transaction.sdk"/>
-      <import feature="org.eclipse.emf.ecoretools.design" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.emf.query.sdk"/>
-      <import feature="org.eclipse.xsd.sdk"/>
-      <import feature="org.eclipse.emf.validation.sdk"/>
-      <import feature="org.eclipse.emf.compare.source"/>
-      <import feature="org.eclipse.emf.compare.ide.ui.source"/>
-      <import feature="org.eclipse.amalgam.discovery"/>
-      <import feature="org.eclipse.emf.cdo.epp" />
-      <import feature="org.eclipse.gmf.runtime.sdk"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.emf.eef.codegen.ecore-feature"  version="1.2.0.qualifier" match="compatible"/>
-      <import feature="org.eclipse.epp.package.common.feature"/>
-      <import feature="org.eclipse.emf.ecp.sdk.feature"/>
-      <import feature="org.eclipse.emf.emfstore.sdk.feature"/>
+   <!--
+        All requirements to features and the content of the product are defined 
+        in the product configuration epp.product since Eclipse Neon. For further
+        details see the following bug:
+
+        Bug 332989 - Allow parts of a package to upgraded or removed
+        https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
+     -->
    </requires>
 
    <plugin
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 089a7933..5c4b2781 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -186,6 +186,41 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.epp.package.modeling.feature" version="4.6.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.6.0.qualifier"/>
+      <feature id="org.eclipse.platform" version="4.6.0.qualifier"/>
+
+      <feature id="org.eclipse.amalgam.discovery" installMode="root"/>
+      <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
+      <!-- not available in Neon on 2016-02-21
+      <feature id="org.eclipse.egit.import" installMode="root"/>
+      -->
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.emf.cdo.epp" installMode="root"/>
+      <feature id="org.eclipse.emf.compare.ide.ui.source" installMode="root"/>
+      <feature id="org.eclipse.emf.compare.source" installMode="root"/>
+      <feature id="org.eclipse.emf.ecoretools.design" version="3.1.0.qualifier" installMode="root"/>
+      <feature id="org.eclipse.emf.ecp.sdk.feature" installMode="root"/>
+      <feature id="org.eclipse.emf.eef.codegen.ecore-feature" version="1.5.0.qualifier" installMode="root"/>
+      <feature id="org.eclipse.emf.emfstore.sdk.feature" installMode="root"/>
+      <feature id="org.eclipse.emf.query.sdk" installMode="root"/>
+      <feature id="org.eclipse.emf.sdk" installMode="root"/>
+      <feature id="org.eclipse.emf.transaction.sdk" installMode="root"/>
+      <feature id="org.eclipse.emf.validation.sdk" installMode="root"/>
+      <feature id="org.eclipse.gef.sdk" installMode="root"/>
+      <feature id="org.eclipse.gmf.runtime.sdk" installMode="root"/>
+      <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.pde_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.ocl.all.sdk" installMode="root"/>
+      <feature id="org.eclipse.pde" installMode="root"/>
+      <feature id="org.eclipse.sdk" installMode="root"/>
+      <feature id="org.eclipse.uml2.sdk" installMode="root"/>
+      <feature id="org.eclipse.xsd.sdk" installMode="root"/>
    </features>