Revert "Bug 577714: Standardize common features for all packages"

This reverts commit 45840ad3d46bed6e70529ea17c800b866cddb261.

Reason for revert: Wasn't ready to be submitted yet.

Change-Id: I227e0a1e1a3135c482a7ddcec563774e86ad9347

18 files changed, 36 insertions, 191 deletions

diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 4320810e..83d5b6e8 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -203,18 +203,10 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.committers.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.committers.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
       <feature id="org.eclipse.help"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
@@ -229,6 +221,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.egit.mylyn" installMode="root"/>
       <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
       <feature id="org.eclipse.jgit.http.apache" installMode="root"/>
@@ -250,6 +243,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.team_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.versions" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.swt.tools.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.embedder.node.feature" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.committers.product/pom.xml b/packages/org.eclipse.epp.package.committers.product/pom.xml
index fd100f0c..e4927c77 100644
--- a/packages/org.eclipse.epp.package.committers.product/pom.xml
+++ b/packages/org.eclipse.epp.package.committers.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.committers</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 204957e3..bde1dd43 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -203,18 +203,11 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.cpp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.cpp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.cdt" installMode="root"/>
       <feature id="org.eclipse.cdt.autotools" installMode="root"/>
       <feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
@@ -232,6 +225,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
       <feature id="org.eclipse.launchbar" installMode="root"/>
       <feature id="org.eclipse.launchbar.remote" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.linuxtools.cdt.libhover.feature" installMode="root"/>
       <feature id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature" installMode="root"/>
       <feature id="org.eclipse.linuxtools.changelog.c" installMode="root"/>
@@ -240,6 +234,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.linuxtools.rpm" installMode="root"/>
       <feature id="org.eclipse.linuxtools.valgrind" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature" installMode="root"/>
       <feature id="org.eclipse.tracecompass.gdbtrace" installMode="root"/>
       <feature id="org.eclipse.tracecompass.lttng2.control" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index a32c35a4..ce642dad 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -203,21 +203,14 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.dsl.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.dsl.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.emf.ecore.xcore.sdk" installMode="root"/>
       <feature id="org.eclipse.emf.mwe2.language.sdk" installMode="root"/>
       <feature id="org.eclipse.emf.sdk" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.xtext.sdk" installMode="root"/>
       <feature id="org.eclipse.lsp4j.sdk" installMode="root"/>
    </features>
diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml
index 9ea3eb1c..306e17f5 100644
--- a/packages/org.eclipse.epp.package.dsl.product/pom.xml
+++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.dsl</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index 79623361..3531a22f 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -203,18 +203,11 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.embedcpp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.embedcpp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.cdt" installMode="root"/>
       <feature id="org.eclipse.cdt.autotools" installMode="root"/>
       <feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
@@ -229,6 +222,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
       <feature id="org.eclipse.launchbar" installMode="root"/>
       <feature id="org.eclipse.launchbar.remote" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.linuxtools.cdt.libhover.feature" installMode="root"/>
       <feature id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature" installMode="root"/>
       <feature id="org.eclipse.linuxtools.changelog.c" installMode="root"/>
@@ -237,6 +231,8 @@ United States, other countries, or both.
       <feature id="org.eclipse.linuxtools.rpm" installMode="root"/>
       <feature id="org.eclipse.linuxtools.valgrind" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature" installMode="root"/>
       <feature id="org.eclipse.tracecompass.gdbtrace" installMode="root"/>
       <feature id="org.eclipse.tracecompass.lttng2.control" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index 9a555e41..670429b4 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -203,27 +203,24 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.java.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.java.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.buildship" installMode="root"/>
       <feature id="org.eclipse.eclemma.feature" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext.editors_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.xml.feature" installMode="root"/>
       <feature id="org.eclipse.tips.feature" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 5abb22b5..9ccbe5fa 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -203,18 +203,11 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.jee.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.jee.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.datatools.common.doc.user" installMode="root"/>
       <feature id="org.eclipse.datatools.connectivity.doc.user" installMode="root"/>
       <feature id="org.eclipse.datatools.connectivity.feature" installMode="root"/>
@@ -253,6 +246,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.datatools.sqltools.doc.user" installMode="root"/>
       <feature id="org.eclipse.buildship" installMode="root"/>
       <feature id="org.eclipse.eclemma.feature" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.egit.mylyn" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.jpt.common.eclipselink.feature" installMode="root"/>
@@ -291,6 +285,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.pde" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.wst.common.fproj" installMode="root"/>
       <feature id="org.eclipse.wst.xsl.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.feature" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 18b6849b..7939df7a 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -203,19 +203,12 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.modeling.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.modeling.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.e4.core.tools.feature" 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"/>
@@ -233,6 +226,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.gmf.runtime.sdk" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" 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"/>
diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml
index 8d03b84c..ed02d527 100644
--- a/packages/org.eclipse.epp.package.modeling.product/pom.xml
+++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.modeling</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
index b6ac066c..1067450b 100644
--- a/packages/org.eclipse.epp.package.parallel.product/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -203,18 +203,10 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.parallel.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.parallel.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.cdt" installMode="root"/>
       <feature id="org.eclipse.cdt.autotools" installMode="root"/>
       <feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
@@ -223,7 +215,10 @@ United States, other countries, or both.
       <feature id="org.eclipse.cdt.debug.ui.memory" installMode="root"/>
       <feature id="org.eclipse.cdt.launch.remote" installMode="root"/>
       <feature id="org.eclipse.cdt.testsrunner.feature" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.ptp" installMode="root"/>
       <feature id="org.eclipse.ptp.debug.sdm" installMode="root"/>
       <feature id="org.eclipse.ptp.fortran" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.parallel.product/pom.xml b/packages/org.eclipse.epp.package.parallel.product/pom.xml
index dbbe0764..a7233f5a 100644
--- a/packages/org.eclipse.epp.package.parallel.product/pom.xml
+++ b/packages/org.eclipse.epp.package.parallel.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.parallel</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 4cd2e7e3..2c759bf0 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -203,18 +203,11 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.php.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.php.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
       <feature id="org.eclipse.egit.mylyn" installMode="root"/>
       <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
@@ -222,12 +215,14 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.php" installMode="root"/>
       <feature id="org.eclipse.php.composer" installMode="root"/>
       <feature id="org.eclipse.php.mylyn" installMode="root"/>
       <feature id="org.eclipse.php.phpunit.feature" installMode="root"/>
       <feature id="org.eclipse.php.profiler" installMode="root"/>
       <feature id="org.eclipse.php.rdt.sync" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.embedder.node.feature" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml
index 281dd800..a0410467 100644
--- a/packages/org.eclipse.epp.package.php.product/pom.xml
+++ b/packages/org.eclipse.epp.package.php.product/pom.xml
@@ -26,18 +26,4 @@
   <artifactId>epp.package.php</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 76fed19d..4d919f95 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -203,18 +203,10 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.rcp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
-      <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.rcp.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.pde"/>
       <feature id="org.eclipse.platform.source"/>
@@ -228,6 +220,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.rap.tools.feature" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml
index aadc4280..70c27610 100644
--- a/packages/org.eclipse.epp.package.rcp.product/pom.xml
+++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.rcp</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index f8d165a5..eaf4df5e 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -203,25 +203,20 @@ United States, other countries, or both.
    </plugins>
 
    <features>
-      <!-- common features that all products have -->
+      <feature id="org.eclipse.epp.package.scout.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
-      <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
-      <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.jgit" installMode="root"/>
-
-      <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.scout.feature" version="4.23.0.qualifier"/>
       <feature id="org.eclipse.help.source" installMode="root"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.jdt.source" installMode="root"/>
+      <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.jst.web_ui.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.scout.sdk-feature" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml
index 5b12af00..19dd8638 100644
--- a/packages/org.eclipse.epp.package.scout.product/pom.xml
+++ b/packages/org.eclipse.epp.package.scout.product/pom.xml
@@ -27,18 +27,4 @@
   <artifactId>epp.package.scout</artifactId>
   <packaging>eclipse-repository</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <!-- Do not include execution environment units, so we're sure JustJ is used -->
-          <executionEnvironment>none</executionEnvironment>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>