118 lines
5.1 KiB
Diff
118 lines
5.1 KiB
Diff
diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml
|
|
--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-03-27 10:30:27.000000000 -0400
|
|
+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml 2011-08-23 14:01:19.026328809 -0400
|
|
@@ -36,7 +36,7 @@
|
|
unpack="false"/>
|
|
|
|
<plugin
|
|
- id="com.sun.el"
|
|
+ id="javax.el"
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
@@ -50,7 +50,7 @@
|
|
unpack="false"/>
|
|
|
|
<plugin
|
|
- id="org.apache.jasper.glassfish"
|
|
+ id="org.glassfish.web.javax.servlet.jsp"
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
--- eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF.bak 2013-01-28 12:30:26.000000000 +0100
|
|
+++ eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF 2013-01-28 13:07:14.670531951 +0100
|
|
@@ -43,8 +43,8 @@
|
|
org.eclipse.core.runtime;bundle-version="3.6.0",
|
|
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
|
|
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
|
|
- org.apache.lucene.analysis;bundle-version="3.5.0",
|
|
- org.apache.lucene.core;bundle-version="3.5.0"
|
|
+ org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
|
|
+ org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)"
|
|
Import-Package: com.ibm.icu.text,
|
|
org.eclipse.equinox.http.jetty;resolution:=optional
|
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
|
--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.orig 2013-01-28 12:12:13.000000000 +0100
|
|
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2013-01-28 13:51:15.558956394 +0100
|
|
@@ -37,18 +37,18 @@
|
|
<extraRequirements>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
- <id>org.apache.lucene</id>
|
|
- <versionRange>[2.9,3.0)</versionRange>
|
|
+ <id>org.apache.lucene.core</id>
|
|
+ <versionRange>[3.0,4.0)</versionRange>
|
|
</requirement>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
<id>org.apache.lucene.analysis</id>
|
|
- <versionRange>[2.9,3.0)</versionRange>
|
|
+ <versionRange>[3.0,4.0)</versionRange>
|
|
</requirement>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
<id>org.apache.commons.logging</id>
|
|
- <versionRange>[1.0,1.1)</versionRange>
|
|
+ <versionRange>[1.0,1.2)</versionRange>
|
|
</requirement>
|
|
</extraRequirements>
|
|
</dependency-resolution>
|
|
--- eclipse.platform.ua/pom.xml.bak 2013-01-28 12:30:27.000000000 +0100
|
|
+++ eclipse.platform.ua/pom.xml 2013-01-28 15:44:17.682451904 +0100
|
|
@@ -53,7 +53,7 @@
|
|
<extraRequirements>
|
|
<requirement>
|
|
<type>eclipse-plugin</type>
|
|
- <id>org.apache.lucene</id>
|
|
+ <id>org.apache.lucene.core</id>
|
|
<versionRange>[3.5,4.0)</versionRange>
|
|
</requirement>
|
|
<requirement>
|
|
--- eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF.bak 2013-01-28 12:30:27.000000000 +0100
|
|
+++ eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF 2013-01-28 15:51:21.719671711 +0100
|
|
@@ -25,9 +25,9 @@
|
|
Bundle-ClassPath: ua-tests.jar
|
|
Import-Package: javax.servlet;version="2.4.0",
|
|
javax.servlet.http;version="2.4.0",
|
|
- org.apache.lucene.index;core="split";version="3.5.0",
|
|
- org.apache.lucene.search;core="split";version="3.5.0",
|
|
- org.apache.lucene.store;core="split";version="3.5.0"
|
|
+ org.apache.lucene.index;version="[3.5.0,4.0.0)",
|
|
+ org.apache.lucene.search;version="[3.5.0,4.0.0)",
|
|
+ org.apache.lucene.store;version="[3.5.0,4.0.0)"
|
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
|
Export-Package: org.eclipse.ua.tests,
|
|
org.eclipse.ua.tests.browser,
|
|
--- eclipse.platform.ua/org.eclipse.ua.tests/pom.xml.bak 2013-01-28 12:30:27.000000000 +0100
|
|
+++ eclipse.platform.ua/org.eclipse.ua.tests/pom.xml 2013-01-28 19:23:02.071410170 +0100
|
|
@@ -22,4 +22,29 @@
|
|
<artifactId>org.eclipse.ua.tests</artifactId>
|
|
<version>3.3.600-SNAPSHOT</version>
|
|
<packaging>eclipse-test-plugin</packaging>
|
|
+
|
|
+ <build>
|
|
+ <plugins>
|
|
+ <plugin>
|
|
+ <groupId>org.eclipse.tycho</groupId>
|
|
+ <artifactId>target-platform-configuration</artifactId>
|
|
+ <configuration>
|
|
+ <dependency-resolution>
|
|
+ <extraRequirements>
|
|
+ <requirement>
|
|
+ <type>eclipse-plugin</type>
|
|
+ <id>org.apache.lucene.core</id>
|
|
+ <versionRange>[3.0,4.0)</versionRange>
|
|
+ </requirement>
|
|
+ <requirement>
|
|
+ <type>eclipse-plugin</type>
|
|
+ <id>org.apache.lucene.analysis</id>
|
|
+ <versionRange>[3.0,4.0)</versionRange>
|
|
+ </requirement>
|
|
+ </extraRequirements>
|
|
+ </dependency-resolution>
|
|
+ </configuration>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
</project>
|