c202a65
From 6dd34f0b0365e0529f3852c688bfd99519f035d1 Mon Sep 17 00:00:00 2001
dd562ff
From: Mat Booth <mat.booth@redhat.com>
dd562ff
Date: Thu, 6 Dec 2018 11:38:58 +0000
c202a65
Subject: [PATCH] IU inclusion changes:
dd562ff
c202a65
* Change features bundling third-party modules to feature requirements
c202a65
* Make some IU name changes to accommodate for distro-specific packaging
dd562ff
---
dd562ff
 .../org.eclipse.jdt-feature/feature.xml       | 114 ++-----------
dd562ff
 .../org.eclipse.pde-feature/feature.xml       |  16 +-
c202a65
 .../bundles/org.eclipse.jdt.doc.isv/pom.xml   |   2 +-
c202a65
 .../bundles/org.eclipse.pde.doc.user/pom.xml  |   2 +-
c202a65
 .../org.eclipse.platform.doc.isv/pom.xml      |  10 +-
dd562ff
 .../org.eclipse.help-feature/feature.xml      | 130 +++------------
6ad80ad
 .../org.eclipse.platform-feature/feature.xml  |  18 +--
6ad80ad
 .../org.eclipse.sdk.tests/feature.xml         |  58 ++-----
dd562ff
 .../org.eclipse.test-feature/feature.xml      |  56 +------
dd562ff
 .../org.eclipse.tips.feature/feature.xml      |  11 +-
dd562ff
 .../features/org.eclipse.e4.rcp/feature.xml   | 150 ++----------------
c202a65
 11 files changed, 87 insertions(+), 480 deletions(-)
dd562ff
dd562ff
diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
c202a65
index e12ef6a13..6deae2a13 100644
dd562ff
--- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
dd562ff
+++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml
53f7c53
@@ -19,6 +19,23 @@
bbe6075
       %license
bbe6075
    </license>
f73fd5c
 
bbe6075
+   <requires>
bbe6075
+      <import plugin="org.junit" />
bbe6075
+      <import plugin="org.hamcrest.core" />
53f7c53
+      <import plugin="org.junit.jupiter.api" />
53f7c53
+      <import plugin="org.junit.jupiter.engine" />
53f7c53
+      <import plugin="org.junit.jupiter.migrationsupport" />
53f7c53
+      <import plugin="org.junit.jupiter.params" />
53f7c53
+      <import plugin="org.junit.platform.commons" />
53f7c53
+      <import plugin="org.junit.platform.engine" />
53f7c53
+      <import plugin="org.junit.platform.launcher" />
53f7c53
+      <import plugin="org.junit.platform.runner" />
53f7c53
+      <import plugin="org.junit.platform.suite.api" />
53f7c53
+      <import plugin="org.junit.vintage.engine" />
53f7c53
+      <import plugin="org.opentest4j" />
53f7c53
+      <import plugin="org.apiguardian" />
bbe6075
+   </requires>
bbe6075
+
f73fd5c
    
bbe6075
          id="org.eclipse.jdt"
bbe6075
          download-size="0"
c202a65
@@ -167,103 +184,6 @@
4085f55
          version="0.0.0"
dd562ff
          unpack="false"/>
dd562ff
 
4085f55
-   
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"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.api"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.migrationsupport"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.jupiter.params"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.commons"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.launcher"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.runner"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.platform.suite.api"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.junit.vintage.engine"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
53f7c53
-
53f7c53
-   
53f7c53
-         id="org.opentest4j"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
53f7c53
-         unpack="false"/>
4085f55
-
53f7c53
-   
53f7c53
-         id="org.apiguardian"
53f7c53
-         download-size="0"
53f7c53
-         install-size="0"
53f7c53
-         version="0.0.0"
dd562ff
-         unpack="false"/>
dd562ff
-
4085f55
    
dd562ff
          id="org.eclipse.jdt.doc.user"
dd562ff
          download-size="0"
dd562ff
diff --git a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
c202a65
index 57a58c6d5..a9c3e2c9b 100644
dd562ff
--- a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
dd562ff
+++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
bbe6075
@@ -21,6 +21,8 @@
bbe6075
 
bbe6075
    <requires>
4085f55
       <import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
bbe6075
+      <import plugin="org.objectweb.asm" />
bbe6075
+      <import plugin="org.objectweb.asm.tree" />
bbe6075
    </requires>
f73fd5c
 
f73fd5c
    
bf632f0
@@ -78,20 +80,6 @@
bbe6075
          version="0.0.0"
dd562ff
          unpack="false"/>
dd562ff
 
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"
dd562ff
-         unpack="false"/>
dd562ff
-
bbe6075
    
dd562ff
          id="org.eclipse.pde.api.tools"
dd562ff
          download-size="0"
c202a65
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
c202a65
index abc2711c0..cada26023 100644
c202a65
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
c202a65
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
c202a65
@@ -120,7 +120,7 @@
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
c202a65
-                      <artifactId>javax.annotation</artifactId>
c202a65
+                      <artifactId>javax.annotation-api</artifactId>
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
c202a65
diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
c202a65
index 16a7a02dc..23ffa475a 100644
c202a65
--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
c202a65
+++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml
c202a65
@@ -119,7 +119,7 @@
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
c202a65
-                      <artifactId>javax.annotation</artifactId>
c202a65
+                      <artifactId>javax.annotation-api</artifactId>
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
dd562ff
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
c202a65
index 5b9e03021..1702d4dc6 100644
dd562ff
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
dd562ff
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
c202a65
@@ -78,12 +78,12 @@
dd562ff
                   </requirement>
dd562ff
                   <requirement>
dd562ff
                     <type>eclipse-plugin</type>
dd562ff
-                    <id>javax.annotation</id>
c202a65
+                    <id>javax.annotation-api</id>
c202a65
                     <versionRange>0.0.0</versionRange>
c202a65
                   </requirement>
c202a65
                   <requirement>
c202a65
                     <type>eclipse-plugin</type>
dd562ff
-                    <id>javax.el</id>
dd562ff
+                    <id>javax.el-api</id>
dd562ff
                     <versionRange>0.0.0</versionRange>
dd562ff
                   </requirement>
dd562ff
                   <requirement>
c202a65
@@ -93,7 +93,7 @@
dd562ff
                   </requirement>
dd562ff
                   <requirement>
dd562ff
                     <type>eclipse-plugin</type>
dd562ff
-                    <id>javax.servlet</id>
dd562ff
+                    <id>javax.servlet-api</id>
dd562ff
                     <versionRange>0.0.0</versionRange>
dd562ff
                   </requirement>
dd562ff
                   <requirement>
c202a65
@@ -118,7 +118,7 @@
dd562ff
                   </requirement>
dd562ff
                   <requirement>
dd562ff
                     <type>eclipse-plugin</type>
dd562ff
-                    <id>org.apache.jasper.glassfish</id>
dd562ff
+                    <id>org.glassfish.web.javax.servlet.jsp</id>
dd562ff
                     <versionRange>0.0.0</versionRange>
dd562ff
                   </requirement>
dd562ff
                   <requirement>
c202a65
@@ -287,7 +287,7 @@
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
c202a65
-                      <artifactId>javax.annotation</artifactId>
c202a65
+                      <artifactId>javax.annotation-api</artifactId>
c202a65
                       <type>eclipse-plugin</type>
c202a65
                     </dependency>
c202a65
                     <dependency>
dd562ff
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
c202a65
index 79fa77d7e..5f3d6f6d0 100644
dd562ff
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
dd562ff
+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
bf632f0
@@ -21,69 +21,6 @@
dd562ff
       %license
f73fd5c
    </license>
f73fd5c
 
dd562ff
-   
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
-   
c736234
-         id="org.apache.lucene.analyzers-common"
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
-   
c736234
-         id="org.apache.lucene.analyzers-smartcn"
c736234
-         download-size="0"
c736234
-         install-size="0"
c736234
-         version="0.0.0"
c736234
-         unpack="false"/>
c736234
-
dd562ff
    
f73fd5c
          id="org.eclipse.equinox.http.jetty"
f73fd5c
          download-size="0"
bf632f0
@@ -140,55 +77,6 @@
dd562ff
          version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
dd562ff
-   
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
-
dd562ff
    
f73fd5c
          id="org.eclipse.core.net"
f73fd5c
          download-size="0"
bf632f0
@@ -203,4 +91,22 @@
f73fd5c
          version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
c736234
+   <requires>
c736234
+      <import plugin="javax.el-api" />
c736234
+      <import plugin="javax.servlet-api" />
f73fd5c
+      <import plugin="javax.servlet.jsp" />
c736234
+      <import plugin="com.sun.el.javax.el" />
f73fd5c
+      <import plugin="org.apache.commons.logging" />
c736234
+      <import plugin="org.glassfish.web.javax.servlet.jsp" />
8fcf627
+      <import plugin="org.apache.lucene.analyzers-common" />
f73fd5c
+      <import plugin="org.apache.lucene.core" />
c736234
+      <import plugin="org.apache.lucene.analyzers-smartcn" />
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" />
c736234
+   </requires>
f73fd5c
 </feature>
6ad80ad
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
c202a65
index 94f21e6f8..694d49dc1 100644
6ad80ad
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
6ad80ad
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
6ad80ad
@@ -19,6 +19,11 @@
6ad80ad
       %license
6ad80ad
    </license>
6ad80ad
 
6ad80ad
+   <requires>
6ad80ad
+      <import plugin="org.apache.ant" />
6ad80ad
+      <import plugin="com.jcraft.jsch" />
6ad80ad
+   </requires>
6ad80ad
+
6ad80ad
    
6ad80ad
          id="org.eclipse.rcp"
6ad80ad
          version="0.0.0"/>
6ad80ad
@@ -32,12 +37,6 @@
6ad80ad
          id="org.eclipse.help"
6ad80ad
          version="0.0.0"/>
6ad80ad
 
6ad80ad
-   
6ad80ad
-         id="org.apache.ant"
6ad80ad
-         download-size="0"
6ad80ad
-         install-size="0"
6ad80ad
-         version="0.0.0"/>
6ad80ad
-
6ad80ad
    
6ad80ad
          id="org.eclipse.ant.core"
6ad80ad
          download-size="0"
6ad80ad
@@ -45,13 +44,6 @@
6ad80ad
          version="0.0.0"
6ad80ad
          unpack="false"/>
6ad80ad
 
6ad80ad
-   
6ad80ad
-         id="com.jcraft.jsch"
6ad80ad
-         download-size="0"
6ad80ad
-         install-size="0"
6ad80ad
-         version="0.0.0"
6ad80ad
-         unpack="false"/>
6ad80ad
-
6ad80ad
    
6ad80ad
          id="org.eclipse.compare.core"
6ad80ad
          download-size="0"
dd562ff
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
c202a65
index 6d7659ab9..23f4e6524 100644
dd562ff
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
dd562ff
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
6ad80ad
@@ -19,6 +19,15 @@
dd562ff
       %license
dd562ff
    </license>
c48d605
 
dd562ff
+   <requires>
dd562ff
+      <import plugin="org.apache.commons.fileupload" />
dd562ff
+      <import plugin="org.apache.commons.io" />
dd562ff
+      <import plugin="org.hamcrest.core" />
dd562ff
+      <import plugin="org.hamcrest.library" />
dd562ff
+      <import plugin="org.mockito" />
dd562ff
+      <import plugin="org.objenesis" />
dd562ff
+   </requires>
dd562ff
+
dd562ff
    
dd562ff
          id="org.eclipse.test"
dd562ff
          version="0.0.0"/>
c202a65
@@ -427,20 +436,6 @@
dd562ff
          install-size="0"
dd562ff
          version="0.0.0"/>
f73fd5c
 
dd562ff
-   
dd562ff
-         id="org.apache.commons.fileupload"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.apache.commons.io"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
    
dd562ff
          id="org.eclipse.equinox.p2.installer"
dd562ff
          download-size="0"
c202a65
@@ -490,41 +485,6 @@
dd562ff
          install-size="0"
dd562ff
          version="0.0.0"/>
dd562ff
 
f73fd5c
-   
dd562ff
-         id="org.hamcrest.core"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.hamcrest.integration"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.hamcrest.library"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
-    
dd562ff
-         id="org.mockito"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.objenesis"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
    
dd562ff
          id="org.eclipse.ui.tests.pluginchecks"
dd562ff
          download-size="0"
dd562ff
diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
c202a65
index 1f422b76e..9e26326c3 100644
dd562ff
--- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
dd562ff
+++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
dd562ff
@@ -19,6 +19,14 @@
dd562ff
       %license
dd562ff
    </license>
dd562ff
 
dd562ff
+   <requires>
dd562ff
+      <import plugin="org.junit" />
dd562ff
+      <import plugin="org.easymock" />
dd562ff
+      <import plugin="org.hamcrest.core" />
dd562ff
+      <import plugin="org.hamcrest.library" />
dd562ff
+      <import plugin="org.mockito" />
dd562ff
+   </requires>
dd562ff
+
dd562ff
    
dd562ff
          id="org.eclipse.ant.optional.junit"
dd562ff
          download-size="0"
dd562ff
@@ -54,58 +62,10 @@
dd562ff
          fragment="true"
dd562ff
          unpack="false"/>
dd562ff
 
f73fd5c
-   
dd562ff
-         id="org.junit"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
dd562ff
-         version="0.0.0"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.easymock"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.hamcrest.core"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
4085f55
-
c48d605
-   
dd562ff
-         id="org.mockito"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
dd562ff
-         id="net.bytebuddy.byte-buddy"
c48d605
-         download-size="0"
c48d605
-         install-size="0"
c48d605
-         version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
dd562ff
-         id="net.bytebuddy.byte-buddy-agent"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
365159b
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
    
dd562ff
          id="org.eclipse.core.tests.harness"
c736234
          download-size="0"
c736234
          install-size="0"
dd562ff
          version="0.0.0"/>
c736234
 
dd562ff
-   
dd562ff
-         id="org.hamcrest.library"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
 </feature>
dd562ff
diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml
c202a65
index b8f52fe1a..a1d866a52 100644
dd562ff
--- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml
dd562ff
+++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml
dd562ff
@@ -32,6 +32,10 @@
dd562ff
       %license
dd562ff
    </license>
dd562ff
 
dd562ff
+   <requires>
dd562ff
+      <import plugin="com.google.gson" />
dd562ff
+   </requires>
dd562ff
+
dd562ff
    
dd562ff
          id="org.eclipse.tips.ui"
f73fd5c
          download-size="0"
dd562ff
@@ -60,11 +64,4 @@
dd562ff
          version="0.0.0"
f73fd5c
          unpack="false"/>
f73fd5c
 
dd562ff
-   
dd562ff
-         id="com.google.gson"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
dd562ff
 </feature>
dd562ff
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
c202a65
index 0ce4361be..ac28b73c2 100644
dd562ff
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
dd562ff
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
dd562ff
@@ -22,6 +22,23 @@
dd562ff
    <requires>
dd562ff
       <import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
dd562ff
       <import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
dd562ff
+      <import plugin="org.apache.batik.css" />
dd562ff
+      <import plugin="org.w3c.css.sac" />
dd562ff
+      <import plugin="org.apache.batik.util" />
dd562ff
+      <import plugin="org.w3c.dom.svg" />
dd562ff
+      <import plugin="javax.inject" />
dd562ff
+      <import plugin="javax.annotation-api" />
dd562ff
+      <import plugin="org.apache.batik.i18n" />
dd562ff
+      <import plugin="org.apache.batik.constants" />
dd562ff
+      <import plugin="org.apache.xmlgraphics" />
dd562ff
+      <import plugin="org.apache.commons.io" />
dd562ff
+      <import plugin="org.apache.commons.logging" />
dd562ff
+      <import plugin="org.apache.felix.scr" />
dd562ff
+      <import plugin="com.ibm.icu" />
dd562ff
+      <import plugin="org.apache.felix.gogo.command" />
dd562ff
+      <import plugin="org.apache.felix.gogo.runtime" />
dd562ff
+      <import plugin="org.apache.felix.gogo.shell" />
dd562ff
+      <import plugin="org.apache.commons.jxpath" />
dd562ff
    </requires>
f73fd5c
 
f73fd5c
    
dd562ff
@@ -94,62 +111,6 @@
dd562ff
          version="0.0.0"
dd562ff
          unpack="false"/>
dd562ff
 
dd562ff
-   
dd562ff
-         id="org.apache.batik.css"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.w3c.css.sac"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.apache.batik.util"
f73fd5c
-         download-size="0"
f73fd5c
-         install-size="0"
f73fd5c
-         version="0.0.0"
f73fd5c
-         unpack="false"/>
f73fd5c
-
f73fd5c
-   
dd562ff
-         id="org.w3c.dom.svg"
dd562ff
-         download-size="0"
dd562ff
-         install-size="0"
dd562ff
-         version="0.0.0"
c48d605
-         unpack="false"/>
c48d605
-
c48d605
-   
dd562ff
-         id="org.w3c.dom.smil"
bbe6075
-         download-size="0"
bbe6075
-         install-size="0"
bbe6075
-         version="0.0.0"
dd562ff
-         unpack="false"/>
dd562ff
-
dd562ff
-   
dd562ff
-         id="org.w3c.dom.events"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="javax.inject"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="javax.annotation"
dd562ff
-         download-size="0"
dd562ff
-         install-size="0"
dd562ff
-         version="0.0.0"
dd562ff
-         unpack="false"/>
dd562ff
-
dd562ff
    
dd562ff
          id="org.eclipse.e4.core.di"
c242877
          download-size="0"
dd562ff
@@ -164,41 +125,6 @@
dd562ff
          version="0.0.0"
dd562ff
          unpack="false"/>
c242877
 
dd562ff
-   
dd562ff
-         id="org.apache.batik.i18n"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.apache.batik.constants"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.apache.xmlgraphics"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
dd562ff
-   
dd562ff
-         id="org.apache.commons.io"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.apache.commons.logging"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
    
dd562ff
          id="org.eclipse.e4.core.di.extensions"
c242877
          download-size="0"
dd562ff
@@ -244,13 +170,6 @@
dd562ff
          version="0.0.0"
c242877
          unpack="false"/>
c242877
 
c242877
-   
dd562ff
-         id="org.apache.felix.scr"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
dd562ff
    
dd562ff
          id="org.eclipse.equinox.event"
dd562ff
          download-size="0"
dd562ff
@@ -335,13 +254,6 @@
dd562ff
          version="0.0.0"
dd562ff
          unpack="false"/>
dd562ff
 
c242877
-   
dd562ff
-         id="com.ibm.icu"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
dd562ff
    
dd562ff
          id="org.eclipse.equinox.preferences"
dd562ff
          download-size="0"
c202a65
@@ -504,27 +416,6 @@
dd562ff
          version="0.0.0"
dd562ff
          unpack="false"/>
dd562ff
 
c242877
-   
dd562ff
-         id="org.apache.felix.gogo.command"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.apache.felix.gogo.runtime"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
-   
dd562ff
-         id="org.apache.felix.gogo.shell"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
dd562ff
    
dd562ff
          id="org.eclipse.equinox.console"
c242877
          download-size="0"
c202a65
@@ -553,13 +444,6 @@
dd562ff
          version="0.0.0"
dd562ff
          unpack="false"/>
c242877
 
c242877
-   
dd562ff
-         id="org.apache.commons.jxpath"
c242877
-         download-size="0"
c242877
-         install-size="0"
c242877
-         version="0.0.0"
c242877
-         unpack="false"/>
c242877
-
c242877
    
dd562ff
          id="org.eclipse.e4.emf.xpath"
c242877
          download-size="0"
dd562ff
-- 
c202a65
2.21.1
dd562ff