[Features] Leverage transitive inclusion and build source-features

Signed-off-by: Hannes Wellmann <[email protected]>
eclipse-equinox · Apr 23, 2022 · 24313ff · 24313ff
1 parent 10adaea
commit 24313ff
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 313 deletions.
diff --git a/features/org.eclipse.equinox.core.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.core.feature/forceQualifierUpdate.txt
@@ -8,3 +8,4 @@ Touch feature for I20180903-0800 failure due to new felix.scr qualifier.
 Bug 551174 - Comparator errors in 4.14 I build - I20190917-1800
 Bug 544571 - Update felix SCR to 2.0.16
 4.19 I-Build: I20210204-0900 - BUILD FAILED
+[Features] Leverage transitive inclusion and build source-features: https://github.com/eclipse-equinox/equinox.bundles/pull/20
diff --git a/features/org.eclipse.equinox.core.sdk/feature.xml b/features/org.eclipse.equinox.core.sdk/feature.xml
@@ -19,62 +19,13 @@
       %license
    </license>
 
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.compatibility.state"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.compatibility.state.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.equinox.core.feature"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.common.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.equinox.core.feature.source"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.equinox.launcher"
@@ -90,20 +41,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.registry.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.supplement"
          download-size="0"
@@ -148,20 +85,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.osgi.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.util.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.concurrent"
          download-size="0"
@@ -176,20 +99,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.security"
          download-size="0"
@@ -301,20 +210,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.console"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.console.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.console.ssh"
          download-size="0"
@@ -337,48 +232,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.felix.gogo.command"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.gogo.command.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.gogo.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.gogo.runtime.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.gogo.shell"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.felix.gogo.shell.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.sshd.osgi"
          download-size="0"

diff --git a/features/org.eclipse.equinox.sdk/feature.xml b/features/org.eclipse.equinox.sdk/feature.xml
@@ -35,8 +35,4 @@
          id="org.eclipse.equinox.executable"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.equinox.core.feature"
-         version="0.0.0"/>
-
 </feature>
diff --git a/features/org.eclipse.equinox.server.core/.project b/features/org.eclipse.equinox.server.core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.equinox.server.core.feature</name>
+	<name>org.eclipse.equinox.server.core</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
@@ -48,4 +48,5 @@ Bug 574035 - Update to Jetty 10.0.4
 Bug 574035 - Update to Jetty 10.0.5-SNAPSHOT
 Bug 574035 - Update to Jetty 10.0.5
 Bug 575313 - Update to Jetty 10.0.6 
-Update to Jetty 10.0.9
+Update to Jetty 10.0.9
+[Features] Leverage transitive inclusion and build source-features: https://github.com/eclipse-equinox/equinox.bundles/pull/20
diff --git a/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt
@@ -22,4 +22,5 @@ Bug 506597 - Build failure on I20161026-2000
 Bug 528810 - Compilation failure in I20171214-2000
 Bug 444188 - EclipsePreferences is not thread safe
 Bug 553238 - Unanticipated comparator errors in I20191119-1800
-Bug 568610 - 4.18 I-Build: I20201106-1800 - BUILD FAILED
+Bug 568610 - 4.18 I-Build: I20201106-1800 - BUILD FAILED
+[Features] Leverage transitive inclusion and build source-features: https://github.com/eclipse-equinox/equinox.bundles/pull/20