diff options
| author | Markus Knauer | 2016-02-21 16:17:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-02-23 10:53:47 +0000 |
| commit | d7de19636864b88e17dfae81bebb09c5ce39bfa8 (patch) | |
| tree | 72477a1282b2df407f40d00334e5a03d524b3aae | |
| parent | 6978f8f3e3262368c1645b98f92ceaed48f13f50 (diff) | |
| download | org.eclipse.epp.packages-d7de19636864b88e17dfae81bebb09c5ce39bfa8.tar.gz org.eclipse.epp.packages-d7de19636864b88e17dfae81bebb09c5ce39bfa8.tar.xz org.eclipse.epp.packages-d7de19636864b88e17dfae81bebb09c5ce39bfa8.zip | |
Scout: 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: I6a32cb26c2b2b5bcc6dc642f2106aa88ce214077
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
| -rw-r--r-- | packages/org.eclipse.epp.package.scout.feature/feature.xml | 33 | ||||
| -rw-r--r-- | packages/org.eclipse.epp.package.scout.product/epp.product | 26 |
2 files changed, 34 insertions, 25 deletions
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml index 2d7d450c..0042f54a 100644 --- a/packages/org.eclipse.epp.package.scout.feature/feature.xml +++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml @@ -26,31 +26,14 @@ search-location="both"/> <requires> - <import feature="org.eclipse.scout.sdk-feature"/> - <import feature="org.eclipse.equinox.p2.user.ui"/> - <import feature="org.eclipse.help"/> - <import feature="org.eclipse.help.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.platform"/> - <import feature="org.eclipse.platform.source"/> - <import feature="org.eclipse.jst.web_ui.feature"/> - <import feature="org.eclipse.epp.package.common.feature"/> - <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.egit"/> - <import feature="org.eclipse.egit.import"/> - <import feature="org.eclipse.egit.mylyn"/> - <import feature="org.eclipse.jgit"/> - <import feature="org.eclipse.m2e.feature"/> - <import feature="org.eclipse.wst.xml_ui.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.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product index 119fab28..d243d658 100644 --- a/packages/org.eclipse.epp.package.scout.product/epp.product +++ b/packages/org.eclipse.epp.package.scout.product/epp.product @@ -186,6 +186,32 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U <features> <feature id="org.eclipse.epp.package.scout.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.egit" installMode="root"/> + <!-- not available in Neon on 2016-02-21 + <feature id="org.eclipse.egit.import" installMode="root"/> + --> + <feature id="org.eclipse.egit.mylyn" installMode="root"/> + <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.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.pde" installMode="root"/> + <feature id="org.eclipse.pde.source" installMode="root"/> + <feature id="org.eclipse.platform.source" installMode="root"/> + <feature id="org.eclipse.scout.sdk-feature" installMode="root"/> + <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/> </features> |