Build against S-4.16M3-202005211000

Change-Id: I5850cbf25b97630ebfa8d2616b08dfbc3b34508c
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index e8bebaf..9b46364 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.18.400.v20200501-0520" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.400.v20200521-1000" 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 85bed40..52ad95c 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -58,11 +58,11 @@
 
 # VERSIONS:
 # Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20200501-0520"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20200521-1000"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="I20200501-0520"}
-DROP=${DROPS4}/${DROP:="I20200501-0520"}
+EVERSION=${EVERSION:="4.16M3"}
+DROP=${DROPS4}/${DROP:="S-4.16M3-202005211000"}
 
 # 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 e48a68d..9f87c10 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -25,11 +25,11 @@
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.5.700.v20200207-2156.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.400.v20200501-0520
-jdt.feature.version.next=3.18.400.v20200501-0521
+jdt.feature.version=3.18.400.v20200521-1000
+jdt.feature.version.next=3.18.400.v20200521-1001
 
 # jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.1000.v20200428-1854.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.3.1000.v20200505-1625.jar
 jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.2.900.v20200428-1854.jar
 # -----------------------------------------------------------