398 lines
10 KiB
Diff
398 lines
10 KiB
Diff
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
|
|
@@ -19,6 +19,11 @@
|
|
%license
|
|
</license>
|
|
|
|
+ <requires>
|
|
+ <import plugin="org.junit" />
|
|
+ <import plugin="org.hamcrest.core" />
|
|
+ </requires>
|
|
+
|
|
<plugin
|
|
id="org.eclipse.jdt"
|
|
download-size="0"
|
|
@@ -151,19 +156,6 @@
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
- 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
|
|
diff --git eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
|
index 88a8daa..382c5ee 100644
|
|
--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
|
+++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml
|
|
@@ -21,6 +21,8 @@
|
|
|
|
<requires>
|
|
<import feature="org.eclipse.jdt" version="3.12.0" match="compatible"/>
|
|
+ <import plugin="org.objectweb.asm" />
|
|
+ <import plugin="org.objectweb.asm.tree" />
|
|
</requires>
|
|
|
|
<plugin
|
|
@@ -83,20 +85,6 @@
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
- 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
|
|
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig 2017-01-04 10:57:15.000000000 +0000
|
|
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
|
@@ -23,62 +23,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"
|
|
@@ -135,55 +79,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"
|
|
@@ -197,4 +92,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>
|
|
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig 2017-01-13 11:29:16.362473652 +0000
|
|
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2017-01-13 11:29:16.371473551 +0000
|
|
@@ -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"
|
|
@@ -757,27 +680,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"
|
|
@@ -806,13 +708,6 @@
|
|
unpack="false"/>
|
|
|
|
<plugin
|
|
- id="org.apache.commons.jxpath"
|
|
- download-size="0"
|
|
- install-size="0"
|
|
- version="0.0.0"
|
|
- unpack="false"/>
|
|
-
|
|
- <plugin
|
|
id="org.eclipse.e4.emf.xpath"
|
|
download-size="0"
|
|
install-size="0"
|
|
@@ -835,4 +730,18 @@
|
|
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.commons.jxpath" />
|
|
+ <import plugin="org.apache.felix.gogo.command" />
|
|
+ <import plugin="org.apache.felix.gogo.runtime" />
|
|
+ <import plugin="org.apache.felix.gogo.shell" />
|
|
+ <import plugin="org.w3c.dom.svg" />
|
|
+ <import plugin="org.w3c.css.sac" />
|
|
+ <import plugin="javax.inject" />
|
|
+ <import plugin="javax.xml" />
|
|
+ </requires>
|
|
</feature>
|
|
--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig 2017-01-04 10:54:36.000000000 +0000
|
|
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2017-01-13 11:28:25.827041896 +0000
|
|
@@ -61,11 +61,6 @@
|
|
</requirement>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
- <id>javax.annotation</id>
|
|
- <versionRange>0.0.0</versionRange>
|
|
- </requirement>
|
|
- <requirement>
|
|
- <type>eclipse-plugin</type>
|
|
<id>javax.el</id>
|
|
<versionRange>0.0.0</versionRange>
|
|
</requirement>
|
|
@@ -96,7 +91,7 @@
|
|
</requirement>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
- <id>org.apache.jasper.glassfish</id>
|
|
+ <id>org.glassfish.web.javax.servlet.jsp</id>
|
|
<versionRange>0.0.0</versionRange>
|
|
</requirement>
|
|
<requirement>
|