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
bbe6075
@@ -19,6 +19,11 @@
bbe6075
       %license
bbe6075
    </license>
f73fd5c
 
bbe6075
+   <requires>
bbe6075
+      <import plugin="org.junit" />
bbe6075
+      <import plugin="org.hamcrest.core" />
bbe6075
+   </requires>
bbe6075
+
f73fd5c
    
bbe6075
          id="org.eclipse.jdt"
bbe6075
          download-size="0"
bbe6075
@@ -151,19 +156,6 @@
bbe6075
          download-size="0"
bbe6075
          install-size="0"
bbe6075
          version="0.0.0"
bbe6075
-         unpack="false"/>
bbe6075
-
bbe6075
-   
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
 
bbe6075
    
c35a6c7
diff --git eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
f73fd5c
index 88a8daa..382c5ee 100644
c35a6c7
--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
c35a6c7
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
bbe6075
@@ -21,6 +21,8 @@
bbe6075
 
bbe6075
    <requires>
bbe6075
       <import feature="org.eclipse.jdt" version="3.12.0" match="compatible"/>
bbe6075
+      <import plugin="org.objectweb.asm" />
bbe6075
+      <import plugin="org.objectweb.asm.tree" />
bbe6075
    </requires>
f73fd5c
 
f73fd5c
    
bbe6075
@@ -83,20 +85,6 @@
bbe6075
          download-size="0"
bbe6075
          install-size="0"
bbe6075
          version="0.0.0"
bbe6075
-         unpack="false"/>
bbe6075
-
bbe6075
-   
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
 
bbe6075
    
3196467
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig	2017-01-04 10:57:15.000000000 +0000
3196467
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml	2017-01-13 11:29:16.371473551 +0000
3196467
@@ -23,62 +23,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"
3196467
@@ -135,55 +79,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"
3196467
@@ -197,4 +92,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" />
8fcf627
+      <import plugin="org.apache.lucene.analyzers-common" />
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>
3196467
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2017-01-13 11:29:16.362473652 +0000
3196467
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2017-01-13 11:29:16.371473551 +0000
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"
3196467
@@ -757,27 +680,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"
3196467
@@ -806,13 +708,6 @@
bbe6075
          unpack="false"/>
bbe6075
 
bbe6075
    
bbe6075
-         id="org.apache.commons.jxpath"
bbe6075
-         download-size="0"
bbe6075
-         install-size="0"
bbe6075
-         version="0.0.0"
bbe6075
-         unpack="false"/>
bbe6075
-
bbe6075
-   
bbe6075
          id="org.eclipse.e4.emf.xpath"
bbe6075
          download-size="0"
bbe6075
          install-size="0"
3196467
@@ -835,4 +730,18 @@
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" />
bbe6075
+     <import plugin="org.apache.commons.jxpath" />
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.w3c.dom.svg" />
f73fd5c
+     <import plugin="org.w3c.css.sac" />
f73fd5c
+     <import plugin="javax.inject" />
f73fd5c
+     <import plugin="javax.xml" />
f73fd5c
+   </requires>
f73fd5c
 </feature>
3196467
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig	2017-01-04 10:54:36.000000000 +0000
3196467
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2017-01-13 11:28:25.827041896 +0000
3196467
@@ -61,11 +61,6 @@
3196467
                   </requirement>
3196467
                   <requirement>
3196467
                     <type>eclipse-plugin</type>
3196467
-                    <id>javax.annotation</id>
3196467
-                    <versionRange>0.0.0</versionRange>
3196467
-                  </requirement>
3196467
-                  <requirement>
3196467
-                    <type>eclipse-plugin</type>
3196467
                     <id>javax.el</id>
3196467
                     <versionRange>0.0.0</versionRange>
3196467
                   </requirement>
3196467
@@ -96,7 +91,7 @@
3196467
                   </requirement>
3196467
                   <requirement>
3196467
                     <type>eclipse-plugin</type>
3196467
-                    <id>org.apache.jasper.glassfish</id>
3196467
+                    <id>org.glassfish.web.javax.servlet.jsp</id>
3196467
                     <versionRange>0.0.0</versionRange>
3196467
                   </requirement>
3196467
                   <requirement>
e73c027
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig	2017-02-15 10:01:24.202436806 +0000
e73c027
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF	2017-02-15 10:01:35.454301845 +0000
e73c027
@@ -38,8 +38,7 @@
e73c027
  org.eclipse.e4.core.commands;bundle-version="0.10.0",
e73c027
  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0"
e73c027
 Bundle-ActivationPolicy: lazy
e73c027
-Import-Package: javax.annotation,
e73c027
- javax.inject;version="1.0.0",
e73c027
+Import-Package: javax.inject;version="1.0.0",
e73c027
  org.osgi.framework;version="1.5.0",
e73c027
  org.osgi.service.event;version="1.3.1"
e73c027
 Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
e73c027
--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig	2017-02-15 10:00:56.352770853 +0000
e73c027
+++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF	2017-02-15 10:01:06.757646050 +0000
e73c027
@@ -14,6 +14,5 @@
e73c027
  org.eclipse.e4.core.di;bundle-version="0.9.0"
e73c027
 Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
e73c027
 Bundle-ActivationPolicy: lazy
e73c027
-Import-Package: javax.annotation,
e73c027
- javax.inject;version="1.0.0"
e73c027
+Import-Package: javax.inject;version="1.0.0"
e73c027
 Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator