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