Building against I20120430-1800 (M7 candidate).
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index fd4b39f..ef14fcd 100644
--- a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
@@ -59,7 +59,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.8.0.v20111130-1318-8-8lFpEFNOfwRf-z-rHTFfRH9B15" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.8.0.v20120429-1635-8-8nFpCFNOfwK7WXoxVGbX8BC834" patch="true"/>
    </requires>
 
    <plugin
diff --git a/releng/build-scripts/build/otdt_prerequisites.sh b/releng/build-scripts/build/otdt_prerequisites.sh
index d85f5d9..d8a311f 100644
--- a/releng/build-scripts/build/otdt_prerequisites.sh
+++ b/releng/build-scripts/build/otdt_prerequisites.sh
@@ -48,11 +48,11 @@
 
 # VERSIONS:
 # Eclipse SKD build identifier:
-EVERSION=I20120411-2034
+EVERSION=I20120430-1800
 # Architecture (as used by OSGi):
 ARCH=`arch`
 # used only locally:
-DROP=${BASEDIR}/drops4/I20120411-2034
+DROP=${BASEDIR}/drops4/I20120430-1800
 
 # EXPORT: archive file of the base eclipse SDK build:
 ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/run.properties b/releng/build-scripts/build/run.properties
index 1963ca8..d34dbe0 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -21,12 +21,12 @@
 # Version dependent names:
 
 # Details of the Eclipse SDK build upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.8.0.v20120119-1950/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.8.0.v20120428-0109/scripts
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.3.0.v20120308-1358.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.8.0.v20111130-1318
-jdt.feature.version.next=3.8.0.v20111130-1319
+jdt.feature.version=3.8.0.v20120429-1635
+jdt.feature.version.next=3.8.0.v20120429-1636
 
 #Git Support for PDE BUILD:
 # (Note: this file must be provided in ${OTScriptDir}/lib)
diff --git a/releng/build-scripts/build/test.properties b/releng/build-scripts/build/test.properties
index 4468f9e..3458f42 100644
--- a/releng/build-scripts/build/test.properties
+++ b/releng/build-scripts/build/test.properties
@@ -2,10 +2,10 @@
 
 # pasted output from processSDKmap.sh:
 # ----
-org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.1.v20120314-0818
-org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.0.v20120328-1141
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.8.0.v20120329-1237
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.8.0.v20120201-2106
+org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.1.v20120424-0604
+org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.0.v20120426-2103
+org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.8.0.v20120429-1424
+org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.8.0.v20120429-1349
 org.eclipse.test.performance=org.eclipse.test.performance_3.7.0.v20120301-1420
 # ----
 
diff --git a/releng/map/otdt.map b/releng/map/otdt.map
index f48c201..86d30fa 100644
--- a/releng/map/otdt.map
+++ b/releng/map/otdt.map
@@ -61,11 +61,11 @@
 

 !-- Tests fetched from original CVS (some are required indirectly by jdt.ui.tests): --

 !   (these lines are generated from SDK map file using processSDKmap.sh)

-plugin@org.eclipse.jdt.core.tests.builder=GIT,tag=v20120314-0818,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.core.tests.builder

-plugin@org.eclipse.jdt.debug.tests=GIT,tag=v20120328-1141,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests

-plugin@org.eclipse.jdt.ui.tests=GIT,tag=v20120329-1237,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests

-plugin@org.eclipse.jdt.ui.tests.refactoring=GIT,tag=v20120201-2106,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests.refactoring

-plugin@org.eclipse.jdt.text.tests=GIT,tag=v20120402-1333,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.text.tests

-plugin@org.eclipse.jface.text.tests=GIT,tag=v20120226-0817,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.text.git,path=org.eclipse.jface.text.tests

+plugin@org.eclipse.jdt.core.tests.builder=GIT,tag=v20120424-0604,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.core.tests.builder

+plugin@org.eclipse.jdt.debug.tests=GIT,tag=v20120426-2103,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests

+plugin@org.eclipse.jdt.ui.tests=GIT,tag=v20120429-1424,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests

+plugin@org.eclipse.jdt.ui.tests.refactoring=GIT,tag=v20120429-1349,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests.refactoring

+plugin@org.eclipse.jdt.text.tests=GIT,tag=v20120427-0818,repo=git://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.text.tests

+plugin@org.eclipse.jface.text.tests=GIT,tag=v20120428-1250,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.text.git,path=org.eclipse.jface.text.tests

 plugin@org.eclipse.text.tests=GIT,tag=v20120312-1446,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.text.git,path=org.eclipse.text.tests

 plugin@org.eclipse.core.filebuffers.tests=GIT,tag=v20111215-1439,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.text.git,path=org.eclipse.core.filebuffers.tests