Bug 533801 - Stop including o.e.equinox.util in productsI20190927-0145I20190926-1800

And equinox.io/ip too as they depend on equinox.util.
Drop bundles from features and bump minor version of the features due to
removal.

Change-Id: I301894027e837103efe72cd08f2269d2f196caae
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

8 files changed, 6 insertions, 68 deletions

diff --git a/features/org.eclipse.equinox.compendium.sdk/build.properties b/features/org.eclipse.equinox.compendium.sdk/build.properties
index 8c96cfcaf..a2e8ec3c1 100644
--- a/features/org.eclipse.equinox.compendium.sdk/build.properties
+++ b/features/org.eclipse.equinox.compendium.sdk/build.properties
@@ -18,12 +18,9 @@ generate.plugin@org.eclipse.equinox.cm.source=org.eclipse.equinox.cm
 generate.plugin@org.eclipse.equinox.device.source=org.eclipse.equinox.device
 generate.plugin@org.eclipse.equinox.ds.source=org.eclipse.equinox.ds
 generate.plugin@org.eclipse.equinox.event.source=org.eclipse.equinox.event
-generate.plugin@org.eclipse.equinox.io.source=org.eclipse.equinox.io
-generate.plugin@org.eclipse.equinox.ip.source=org.eclipse.equinox.ip
 generate.plugin@org.eclipse.equinox.log.source=org.eclipse.equinox.log
 generate.plugin@org.eclipse.equinox.metatype.source=org.eclipse.equinox.metatype
 generate.plugin@org.eclipse.equinox.preferences.source=org.eclipse.equinox.preferences
 generate.plugin@org.eclipse.equinox.useradmin.source=org.eclipse.equinox.useradmin
 generate.plugin@org.eclipse.equinox.wireadmin.source=org.eclipse.equinox.wireadmin
-generate.plugin@org.eclipse.equinox.util.source=org.eclipse.equinox.util
 generate.plugin@org.eclipse.equinox.coordinator.source=org.eclipse.equinox.coordinator 
diff --git a/features/org.eclipse.equinox.compendium.sdk/feature.xml b/features/org.eclipse.equinox.compendium.sdk/feature.xml
index 22246ec88..e65ebdf6a 100644
--- a/features/org.eclipse.equinox.compendium.sdk/feature.xml
+++ b/features/org.eclipse.equinox.compendium.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.compendium.sdk"
       label="%featureName"
-      version="3.19.100.qualifier"
+      version="3.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -104,34 +104,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.io.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.ip"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.ip.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.equinox.metatype"
          download-size="0"
          install-size="0"
@@ -188,20 +160,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.util.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.apache.felix.scr"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.equinox.compendium.sdk/pom.xml b/features/org.eclipse.equinox.compendium.sdk/pom.xml
index 6f0214e09..bf5be7a59 100644
--- a/features/org.eclipse.equinox.compendium.sdk/pom.xml
+++ b/features/org.eclipse.equinox.compendium.sdk/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.compendium.sdk</artifactId>
-  <version>3.19.100-SNAPSHOT</version>
+  <version>3.20.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.equinox.core.feature/feature.xml b/features/org.eclipse.equinox.core.feature/feature.xml
index 47a9c7777..f37b916d3 100644
--- a/features/org.eclipse.equinox.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.core.feature"
       label="%featureName"
-      version="1.10.100.qualifier"
+      version="1.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -51,13 +51,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.equinox.registry"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index 858550bb6..90561157b 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.core.feature</artifactId>
-  <version>1.10.100-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.equinox.server.core/feature.xml b/features/org.eclipse.equinox.server.core/feature.xml
index 78929e158..22061fed1 100644
--- a/features/org.eclipse.equinox.server.core/feature.xml
+++ b/features/org.eclipse.equinox.server.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.server.core"
       label="%featureName"
-      version="1.11.100.qualifier"
+      version="1.12.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -51,13 +51,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.core.jobs"
          download-size="0"
          install-size="0"
diff --git a/features/org.eclipse.equinox.server.core/pom.xml b/features/org.eclipse.equinox.server.core/pom.xml
index 170d4785e..061780f5a 100644
--- a/features/org.eclipse.equinox.server.core/pom.xml
+++ b/features/org.eclipse.equinox.server.core/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.core</artifactId>
-  <version>1.11.100-SNAPSHOT</version>
+  <version>1.12.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 99a0ad79c..cca514413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,8 +113,6 @@
     <module>bundles/org.eclipse.equinox.http.servlet</module>
     <module>bundles/org.eclipse.equinox.http.servlet.tests</module>
     <module>bundles/org.eclipse.equinox.http.servletbridge</module>
-    <module>bundles/org.eclipse.equinox.io</module>
-    <module>bundles/org.eclipse.equinox.ip</module>
     <module>bundles/org.eclipse.equinox.jsp.jasper</module>
     <module>bundles/org.eclipse.equinox.jsp.jasper.registry</module>
     <module>bundles/org.eclipse.equinox.log.stream</module>
@@ -131,7 +129,6 @@
     <module>bundles/org.eclipse.equinox.transforms.hook</module>
     <module>bundles/org.eclipse.equinox.transforms.xslt</module>
     <module>bundles/org.eclipse.equinox.useradmin</module>
-    <module>bundles/org.eclipse.equinox.util</module>
     <module>bundles/org.eclipse.equinox.weaving.caching</module>
     <module>bundles/org.eclipse.equinox.weaving.caching.j9</module>
     <module>bundles/org.eclipse.equinox.weaving.hook</module>