diff --git eclipse.jdt/org.eclipse.jdt-feature/feature.xml eclipse.jdt/org.eclipse.jdt-feature/feature.xml
index 0743586..1cbf404 100644
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml
@@ -154,19 +154,6 @@
unpack="false"/>
<plugin
- id="org.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.hamcrest.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jdt.doc.user"
download-size="0"
install-size="0"
@@ -196,4 +183,9 @@
version="0.0.0"
unpack="false"/>
+ <requires>
+ <import plugin="org.junit" />
+ <import plugin="org.hamcrest.core" />
+ </requires>
+
</feature>
diff --git eclipse.pde/org.eclipse.pde-feature/feature.xml eclipse.pde/org.eclipse.pde-feature/feature.xml
index 88a8daa..382c5ee 100644
--- eclipse.pde/org.eclipse.pde-feature/feature.xml
+++ eclipse.pde/org.eclipse.pde-feature/feature.xml
@@ -82,20 +82,6 @@
unpack="false"/>
<plugin
- id="org.objectweb.asm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.objectweb.asm.tree"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.pde.api.tools"
download-size="0"
install-size="0"
@@ -158,4 +144,9 @@
version="0.0.0"
unpack="false"/>
+ <requires>
+ <import plugin="org.objectweb.asm" />
+ <import plugin="org.objectweb.asm.tree" />
+ </requires>
+
</feature>
diff --git eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
index c6d5da0..e76f33f 100644
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -21,62 +21,6 @@
</license>
<plugin
- id="javax.el"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.servlet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.servlet.jsp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.sun.el"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.commons.logging"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.jasper.glassfish"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.lucene.analysis"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.lucene.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.http.jetty"
download-size="0"
install-size="0"
@@ -77,55 +77,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.jetty.continuation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.http"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.io"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.security"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.server"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.servlet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.net"
download-size="0"
install-size="0"
@@ -139,4 +90,21 @@
version="0.0.0"
unpack="false"/>
+ <requires>
+ <import plugin="javax.el" />
+ <import plugin="javax.servlet" />
+ <import plugin="javax.servlet.jsp" />
+ <import plugin="org.apache.commons.logging" />
+ <import plugin="org.apache.lucene.analyzers-common" />
+ <import plugin="org.apache.lucene.core" />
+ <import plugin="org.eclipse.jetty.continuation" />
+ <import plugin="org.eclipse.jetty.http" />
+ <import plugin="org.eclipse.jetty.io" />
+ <import plugin="org.eclipse.jetty.security" />
+ <import plugin="org.eclipse.jetty.server" />
+ <import plugin="org.eclipse.jetty.servlet" />
+ <import plugin="org.eclipse.jetty.util" />
+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
+ </requires>
+
</feature>
diff --git eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
index 8176831..c97bab0 100644
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
@@ -95,62 +95,6 @@
unpack="false"/>
<plugin
- id="org.apache.batik.css"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.css.sac"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.util"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.svg"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.smil"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.w3c.dom.events"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.inject"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.annotation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.e4.core.di"
download-size="0"
install-size="0"
@@ -165,20 +109,6 @@
unpack="false"/>
<plugin
- id="org.apache.batik.util.gui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.e4.core.di.extensions"
download-size="0"
install-size="0"
@@ -315,13 +245,6 @@
unpack="false"/>
<plugin
- id="com.ibm.icu"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
@@ -715,27 +638,6 @@
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.runtime"
- 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.eclipse.equinox.console"
download-size="0"
install-size="0"
@@ -756,4 +658,20 @@
fragment="true"
unpack="false"/>
+ <requires>
+ <import plugin="com.ibm.icu" />
+ <import plugin="org.apache.batik.css" />
+ <import plugin="org.apache.batik.util" />
+ <import plugin="org.apache.batik.util.gui" />
+ <import plugin="org.apache.felix.gogo.command" />
+ <import plugin="org.apache.felix.gogo.runtime" />
+ <import plugin="org.apache.felix.gogo.shell" />
+ <import plugin="javax.annotation-api" />
+ <import plugin="org.w3c.dom.svg" />
+ <import plugin="org.w3c.css.sac" />
+ <import plugin="javax.inject" />
+ <import plugin="javax.xml" />
+ </requires>
+
+
</feature>
diff --git eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index 6f6526b..c05d703 100644
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -36,4 +36,43 @@
<bundle
id="org.eclipse.jdt.core.compiler.batch"
version="0.0.0" />
+
+ <!-- org.eclipse.jdt -->
+ <bundle id="org.junit" />
+ <bundle id="org.hamcrest.core" />
+
+ <!-- org.eclipse.pde -->
+ <bundle id="org.objectweb.asm" />
+ <bundle id="org.objectweb.asm.tree" />
+
+ <!-- org.eclipse.help -->
+ <bundle id="com.sun.el.javax.el" />
+ <bundle id="javax.servlet-api" />
+ <bundle id="javax.servlet.jsp" />
+ <bundle id="org.apache.commons.logging" />
+ <bundle id="org.apache.lucene.analyzers-common" />
+ <bundle id="org.apache.lucene.core" />
+ <bundle id="org.eclipse.jetty.continuation" />
+ <bundle id="org.eclipse.jetty.http" />
+ <bundle id="org.eclipse.jetty.io" />
+ <bundle id="org.eclipse.jetty.security" />
+ <bundle id="org.eclipse.jetty.server" />
+ <bundle id="org.eclipse.jetty.servlet" />
+ <bundle id="org.eclipse.jetty.util" />
+ <bundle id="org.glassfish.web.javax.servlet.jsp" />
+
+ <!-- org.eclipse.e4.rcp -->
+ <bundle id="com.ibm.icu" />
+ <bundle id="org.apache.batik.css" />
+ <bundle id="org.apache.batik.util" />
+ <bundle id="org.apache.batik.util.gui" />
+ <bundle id="org.apache.felix.gogo.command" />
+ <bundle id="org.apache.felix.gogo.runtime" />
+ <bundle id="org.apache.felix.gogo.shell" />
+ <bundle id="javax.annotation-api" />
+ <bundle id="org.w3c.dom.svg" />
+ <bundle id="org.w3c.css.sac" />
+ <bundle id="javax.inject" />
+ <bundle id="javax.xml" />
+
</site>