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