Bug 533801 - Stop including o.e.equinox.util in products
Drop equinox.util and equinox.wireadmin which depends on it.
Change-Id: I76badb888c588c659ab9c5507763f69c4e613028
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/features/org.eclipse.equinox.compendium.sdk/build.properties b/features/org.eclipse.equinox.compendium.sdk/build.properties
index fcea9f1..fe60766 100644
--- a/features/org.eclipse.equinox.compendium.sdk/build.properties
+++ b/features/org.eclipse.equinox.compendium.sdk/build.properties
@@ -22,6 +22,4 @@
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 b392c9b..06ff775 100644
--- a/features/org.eclipse.equinox.compendium.sdk/feature.xml
+++ b/features/org.eclipse.equinox.compendium.sdk/feature.xml
@@ -146,35 +146,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.wireadmin"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.equinox.wireadmin.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- 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.core.feature/feature.xml b/features/org.eclipse.equinox.core.feature/feature.xml
index acf112a..f37b916 100644
--- a/features/org.eclipse.equinox.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.core.feature/feature.xml
@@ -49,13 +49,6 @@
install-size="0"
version="0.0.0"
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"
diff --git a/features/org.eclipse.equinox.server.core/feature.xml b/features/org.eclipse.equinox.server.core/feature.xml
index 54c5937..22061fe 100644
--- a/features/org.eclipse.equinox.server.core/feature.xml
+++ b/features/org.eclipse.equinox.server.core/feature.xml
@@ -49,13 +49,6 @@
install-size="0"
version="0.0.0"
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"
diff --git a/pom.xml b/pom.xml
index ce7f734..f5d5a22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,11 +129,9 @@
<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>
- <module>bundles/org.eclipse.equinox.wireadmin</module>
</modules>
</project>
