Releng: build against 4.8 M7
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 8fb1038..b1fdac7 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.14.0.v20180308-0630" patch="true"/>	
+      <import feature="org.eclipse.jdt" version="3.14.0.v20180509-2000" patch="true"/>	
    </requires>
 
    <plugin
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index f74eef5..3373a7c 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -53,14 +53,14 @@
 
 # VERSIONS:
 # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20180308-0630"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20180509-2000"}
 
 # Architecture (as used by OSGi):
 ARCH=`arch`
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.8M6"}
-DROP=${DROPS4}/${DROP:="S-4.8M6-201803080630"}
+EVERSION=${EVERSION:="4.8M7"}
+DROP=${DROPS4}/${DROP:="S-4.8M7-201805092000/"}
 
 # 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 4b6578d..03e6b19 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -19,16 +19,16 @@
 
 # ------------- insert current versions here ---------------
 # Details of the Eclipse SDK built upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.0.v20180119-1922/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.10.0.v20180410-1429/scripts
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.0.v20180207-1446.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.14.0.v20180308-0630
-jdt.feature.version.next=3.14.0.v20180308-631
+jdt.feature.version=3.14.0.v20180509-2000
+jdt.feature.version.next=3.14.0.v20180509-2001
 
 # jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.100.v20180219-2143.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.100.v20180221-2145.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.200.v20180508-1559.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.200.v20180508-1559.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD: