Releng: build against I20210920-1800
diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index f7eb432..c8b4d78 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.900.v20210906-0500" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.1000.v20210920-1800" 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 5e09303..6254ab9 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:="I20210906-0500"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20210920-1800"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.21"}
-DROP=${DROPS4}/${DROP:="R-4.21-202109060500"}
+EVERSION=${EVERSION:="I20210920-1800"}
+DROP=${DROPS4}/${DROP:="I20210920-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 a8cddfe..b7df1f1 100644
--- a/releng/build-scripts/build/run.properties
+++ b/releng/build-scripts/build/run.properties
@@ -21,16 +21,16 @@
 
 # ------------- insert current versions here ---------------
 # Details of the Eclipse SDK built upon:
-run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.11.0.v20210429-0618/scripts
-org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.6.300.v20210813-1054.jar
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.11.100.v20210916-0743/scripts
+org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.6.400.v20210908-1257.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.900.v20210906-0500
-jdt.feature.version.next=3.18.900.v20210906-0501
+jdt.feature.version=3.18.1000.v20210920-1800
+jdt.feature.version.next=3.18.1000.v20210920-1801
 
 # jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.4.0.v20210708-0430.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.3.0.v20210726-1148.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.4.50.v20210914-1429.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.3.50.v20210909-0524.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD: