Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/feature.xml34
-rw-r--r--packages/org.eclipse.epp.package.cpp.product/epp.product22
2 files changed, 34 insertions, 22 deletions
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index b0aa600e..33e62476 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -23,28 +23,18 @@
<!-- see p2.inf file for optionally imported Linux Tools features -->
<requires>
- <import feature="org.eclipse.equinox.p2.user.ui"/>
- <import feature="org.eclipse.help"/>
- <import feature="org.eclipse.platform"/>
- <import feature="org.eclipse.rcp"/>
- <import feature="org.eclipse.cdt"/>
- <import feature="org.eclipse.cdt.debug.ui.memory"/>
- <import feature="org.eclipse.cdt.msw"/>
- <import feature="org.eclipse.cdt.build.crossgcc"/>
- <import feature="org.eclipse.cdt.launch.remote"/>
- <import feature="org.eclipse.cdt.autotools"/>
- <import feature="org.eclipse.cdt.mylyn"/>
- <import feature="org.eclipse.mylyn_feature"/>
- <import feature="org.eclipse.mylyn.context_feature"/>
- <import feature="org.eclipse.mylyn.team_feature"/>
- <import feature="org.eclipse.mylyn.ide_feature"/>
- <import feature="org.eclipse.mylyn.bugzilla_feature"/>
- <import feature="org.eclipse.mylyn.wikitext_feature"/>
- <import feature="org.eclipse.rse"/>
- <import feature="org.eclipse.egit"/>
- <import feature="org.eclipse.egit.import"/>
- <import feature="org.eclipse.cdt.debug.standalone"/>
- <import feature="org.eclipse.epp.package.common.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
+
+ The CPP package includes several features/IUs by the p2.inf file in
+ the CPP feature; this hasn't been touched and could be part of another
+ change.
+ -->
</requires>
<plugin
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 42f45ee8..5b2a336e 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -186,6 +186,28 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<features>
<feature id="org.eclipse.epp.package.cpp.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.cdt" installMode="root"/>
+ <feature id="org.eclipse.cdt.autotools" installMode="root"/>
+ <feature id="org.eclipse.cdt.build.crossgcc" installMode="root"/>
+ <feature id="org.eclipse.cdt.debug.standalone" installMode="root"/>
+ <feature id="org.eclipse.cdt.debug.ui.memory" installMode="root"/>
+ <feature id="org.eclipse.cdt.launch.remote" installMode="root"/>
+ <feature id="org.eclipse.cdt.msw" installMode="root"/>
+ <feature id="org.eclipse.cdt.mylyn" installMode="root"/>
+ <feature id="org.eclipse.egit" installMode="root"/>
+ <!-- not available in Neon on 2016-02-21
+ <feature id="org.eclipse.egit.import" 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.team_feature" installMode="root"/>
+ <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+ <feature id="org.eclipse.rse" installMode="root"/>
</features>

Back to the top