[581738] The product generator ignores root features
https://bugs.eclipse.org/bugs/show_bug.cgi?id=581738
diff --git a/features/org.eclipse.oomph.targlets-feature/feature.xml b/features/org.eclipse.oomph.targlets-feature/feature.xml
index ebb110f..1c26f2f 100644
--- a/features/org.eclipse.oomph.targlets-feature/feature.xml
+++ b/features/org.eclipse.oomph.targlets-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.oomph.targlets"
label="%featureName"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.oomph.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.targlets-feature/pom.xml b/features/org.eclipse.oomph.targlets-feature/pom.xml
index 46c6314..dcb6095 100644
--- a/features/org.eclipse.oomph.targlets-feature/pom.xml
+++ b/features/org.eclipse.oomph.targlets-feature/pom.xml
@@ -20,6 +20,6 @@
</parent>
<groupId>org.eclipse.oomph.features</groupId>
<artifactId>org.eclipse.oomph.targlets</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
index 5561ada..7c896fa 100644
--- a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.oomph.targlets;singleton:=true
-Bundle-Version: 1.16.0.qualifier
+Bundle-Version: 1.17.0.qualifier
Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
@@ -14,14 +14,14 @@
org.eclipse.equinox.p2.publisher;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.p2.updatesite;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.p2.repository;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.oomph.p2.core;bundle-version="[1.22.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.16.0,2.0.0)";visibility:=reexport
+ org.eclipse.oomph.p2.core;bundle-version="[1.24.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.resources;bundle-version="[1.17.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.internal.targlets;version="1.16.0";x-internal:=true,
- org.eclipse.oomph.targlets;version="1.16.0";x-internal:=true,
- org.eclipse.oomph.targlets.impl;version="1.16.0";x-internal:=true,
- org.eclipse.oomph.targlets.util;version="1.16.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.targlets;version="1.17.0";x-internal:=true,
+ org.eclipse.oomph.targlets;version="1.17.0";x-internal:=true,
+ org.eclipse.oomph.targlets.impl;version="1.17.0";x-internal:=true,
+ org.eclipse.oomph.targlets.util;version="1.17.0";x-internal:=true
Bundle-Activator: org.eclipse.oomph.internal.targlets.TargletsPlugin$Implementation
Service-Component: META-INF/noopPluginConverter.xml
Automatic-Module-Name: org.eclipse.oomph.targlets
diff --git a/plugins/org.eclipse.oomph.targlets/pom.xml b/plugins/org.eclipse.oomph.targlets/pom.xml
index e4efcb1..9675ef9 100644
--- a/plugins/org.eclipse.oomph.targlets/pom.xml
+++ b/plugins/org.eclipse.oomph.targlets/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.targlets</artifactId>
- <version>1.16.0-SNAPSHOT</version>
+ <version>1.17.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/targlets/impl/ProductGeneratorImpl.java b/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/targlets/impl/ProductGeneratorImpl.java
index 640ce34..4d5fd06 100644
--- a/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/targlets/impl/ProductGeneratorImpl.java
+++ b/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/targlets/impl/ProductGeneratorImpl.java
@@ -98,7 +98,8 @@
if (productDescriptor.useFeatures())
{
- addRequirements(componentDefinition, productDescriptor.getFeatures(), Requirement.FEATURE_SUFFIX);
+ addRequirements(componentDefinition, productDescriptor.getFeatures(IProductDescriptor.INCLUDED_FEATURES | IProductDescriptor.ROOT_FEATURES),
+ Requirement.FEATURE_SUFFIX);
}
else
{
