Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2016-02-21 12:03:19 +0000
committerGerrit Code Review @ Eclipse.org2016-02-22 14:05:50 +0000
commit6978f8f3e3262368c1645b98f92ceaed48f13f50 (patch)
treeada8caa38de2e0d63efe2389f7245eaef1672935 /packages
parent5ceae3c376780c8d0ecaed8f6e2e0a304d0652d9 (diff)
downloadorg.eclipse.epp.packages-6978f8f3e3262368c1645b98f92ceaed48f13f50.tar.gz
org.eclipse.epp.packages-6978f8f3e3262368c1645b98f92ceaed48f13f50.tar.xz
org.eclipse.epp.packages-6978f8f3e3262368c1645b98f92ceaed48f13f50.zip
Committers: 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. Bug 332989 - Allow parts of a package to upgraded or removed https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989 Change-Id: I2b1ee17cb39300b66f5eb1266bd54fb7e12bf764 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
Diffstat (limited to 'packages')
-rw-r--r--packages/org.eclipse.epp.package.committers.feature/feature.xml49
-rw-r--r--packages/org.eclipse.epp.package.committers.product/epp.product44
2 files changed, 52 insertions, 41 deletions
diff --git a/packages/org.eclipse.epp.package.committers.feature/feature.xml b/packages/org.eclipse.epp.package.committers.feature/feature.xml
index 5b2edfce..bf9ed134 100644
--- a/packages/org.eclipse.epp.package.committers.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/feature.xml
@@ -26,47 +26,14 @@
search-location="both"/>
<requires>
- <import feature="org.eclipse.platform"/>
- <import feature="org.eclipse.platform.source"/>
- <import feature="org.eclipse.rcp"/>
- <import feature="org.eclipse.rcp.source"/>
- <import feature="org.eclipse.jdt"/>
- <import feature="org.eclipse.jdt.source"/>
- <import feature="org.eclipse.pde"/>
- <import feature="org.eclipse.pde.source"/>
- <import feature="org.eclipse.cvs"/>
- <import feature="org.eclipse.cvs.source"/>
- <import feature="org.eclipse.equinox.p2.user.ui"/>
- <import feature="org.eclipse.help"/>
- <import feature="org.eclipse.e4.core.tools.feature"/>
- <import feature="org.eclipse.egit"/>
- <import feature="org.eclipse.egit.import"/>
- <import feature="org.eclipse.egit.mylyn"/>
- <import feature="org.eclipse.jgit"/>
- <import feature="org.eclipse.jgit.http.apache"/>
- <import feature="org.eclipse.mylyn.bugzilla_feature"/>
- <import feature="org.eclipse.mylyn.builds"/>
- <import feature="org.eclipse.mylyn.commons.identity"/>
- <import feature="org.eclipse.mylyn.commons.notifications"/>
- <import feature="org.eclipse.mylyn.commons.repositories.http"/>
- <import feature="org.eclipse.mylyn.commons.repositories"/>
- <import feature="org.eclipse.mylyn.commons"/>
- <import feature="org.eclipse.mylyn.discovery"/>
- <import feature="org.eclipse.mylyn.gerrit.feature"/>
- <import feature="org.eclipse.mylyn.gerrit.dashboard.feature"/>
- <import feature="org.eclipse.mylyn.git"/>
- <import feature="org.eclipse.mylyn.hudson"/>
- <import feature="org.eclipse.mylyn.monitor"/>
- <import feature="org.eclipse.mylyn.reviews.feature"/>
- <import feature="org.eclipse.mylyn.team_feature"/>
- <import feature="org.eclipse.mylyn.versions"/>
- <import feature="org.eclipse.mylyn.wikitext_feature"/>
- <import feature="org.eclipse.mylyn_feature"/>
- <import feature="org.eclipse.recommenders.rcp.feature"/>
- <import feature="org.eclipse.recommenders.snipmatch.rcp.feature"/>
- <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
- <import feature="org.eclipse.buildship"/>
- <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
+ -->
</requires>
<plugin
diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index b6e7d7fc..c7e8f4b9 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -186,6 +186,50 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<features>
<feature id="org.eclipse.epp.package.committers.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.buildship" installMode="root"/>
+ <feature id="org.eclipse.cvs" installMode="root"/>
+ <feature id="org.eclipse.cvs.source" installMode="root"/>
+ <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
+ <feature id="org.eclipse.egit" installMode="root"/>
+ <!-- not available in since Neon / 2016-02-21
+ <feature id="org.eclipse.egit.import" installMode="root"/>
+ -->
+ <feature id="org.eclipse.egit.mylyn" installMode="root"/>
+ <feature id="org.eclipse.epp.package.common.feature" installMode="root"/>
+ <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
+ <feature id="org.eclipse.help" 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.jgit.http.apache" installMode="root"/>
+ <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
+ <feature id="org.eclipse.mylyn.builds" installMode="root"/>
+ <feature id="org.eclipse.mylyn.commons" installMode="root"/>
+ <feature id="org.eclipse.mylyn.commons.identity" installMode="root"/>
+ <feature id="org.eclipse.mylyn.commons.notifications" installMode="root"/>
+ <feature id="org.eclipse.mylyn.commons.repositories" installMode="root"/>
+ <feature id="org.eclipse.mylyn.commons.repositories.http" installMode="root"/>
+ <feature id="org.eclipse.mylyn.discovery" installMode="root"/>
+ <feature id="org.eclipse.mylyn_feature" installMode="root"/>
+ <feature id="org.eclipse.mylyn.gerrit.dashboard.feature" installMode="root"/>
+ <feature id="org.eclipse.mylyn.gerrit.feature" installMode="root"/>
+ <feature id="org.eclipse.mylyn.git" installMode="root"/>
+ <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
+ <feature id="org.eclipse.mylyn.monitor" installMode="root"/>
+ <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
+ <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.pde" installMode="root"/>
+ <feature id="org.eclipse.pde.source" installMode="root"/>
+ <feature id="org.eclipse.platform.source" installMode="root"/>
+ <feature id="org.eclipse.rcp.source" installMode="root"/>
+ <feature id="org.eclipse.recommenders.mylyn.rcp.feature" installMode="root"/>
+ <feature id="org.eclipse.recommenders.rcp.feature" installMode="root"/>
+ <feature id="org.eclipse.recommenders.snipmatch.rcp.feature" installMode="root"/>
</features>

Back to the top