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.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>
          --- eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF.orig	2013-02-20 17:00:07.000000000 +0100
+++ eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF	2013-02-21 16:29:42.318407536 +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,4.0.0)",
- org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
- org.apache.lucene.store;core=split;version="[3.5.0,4.0.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.releng/features/org.eclipse.help-feature/pom.xml.bak	2013-03-14 11:18:11.000000000 +0100
+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2013-03-14 12:29:48.067564008 +0100
@@ -31,7 +31,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>