diff --git a/features/org.eclipse.objectteams.otdt.core.patch/feature.xml b/features/org.eclipse.objectteams.otdt.core.patch/feature.xml
index 6e618b1..ca78efd 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.1100.v20220308-0310" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.1200.v20220407-0240" 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 4a21334..441adde 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:="I20220308-0310"}
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20220407-0240"}
 
 # used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=${EVERSION:="4.23"}
-DROP=${DROPS4}/${DROP:="R-4.23-202203080310"}
+EVERSION=${EVERSION:="4.24M1"}
+DROP=${DROPS4}/${DROP:="S-4.24M1-202204070240"}
 
 # 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 ed065b9..e03bb2f 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.100.v20210916-0743/scripts
+run.eclipseScriptDir=plugins/org.eclipse.pde.build_3.11.200.v20220323-1307/scripts
 org.eclipse.equinox.launcher_jar=org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar
 
 # for patching our patch feature to match this version with any suffix:
-jdt.feature.version=3.18.1100.v20220308-0310
-jdt.feature.version.next=3.18.1100.v20220308-0311
+jdt.feature.version=3.18.1200.v20220407-0240
+jdt.feature.version.next=3.18.1200.v20220407-0241
 
 # jdt.core fragments for extracting pre-built classes and properties:
-jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.4.50.v20210914-1429.jar
-jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.3.100.v20211201-1611.jar
+jdt.compiler.apt=org.eclipse.jdt.compiler.apt_1.4.100.v20220318-0906.jar
+jdt.compiler.tool=org.eclipse.jdt.compiler.tool_1.3.150.v20220318-0906.jar
 # -----------------------------------------------------------
 
 #Git Support for PDE BUILD:
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 4c93c7f..ce3baaf 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -58,12 +58,12 @@
 plugin@org.hamcrest.library,1.3.0=p2IU,id=org.hamcrest.library,version=1.3.0.v20180524-2246,repository=https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/
 
 !========== JDT/UI: ==========!
-plugin@org.eclipse.jdt.ui=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui
-plugin@org.eclipse.jdt.ui.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests
-plugin@org.eclipse.jdt.ui.tests.refactoring=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests.refactoring
+plugin@org.eclipse.jdt.ui=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui
+plugin@org.eclipse.jdt.ui.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests
+plugin@org.eclipse.jdt.ui.tests.refactoring=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.ui.tests.refactoring
 
 !== temporarily fetch this fragment from sources to avoid module conflict on javax.lang.model et al.: ==
-plugin@org.eclipse.jdt.compiler.tool=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.compiler.tool
+plugin@org.eclipse.jdt.compiler.tool=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.compiler.tool
 
 !***************  OTDT Test CONTRIBUTION  ******************************************************** 
 
@@ -99,15 +99,15 @@
 
 
 !-- Tests fetched from original GIT (some are required indirectly by jdt.ui.tests): --
-plugin@org.eclipse.jdt.core.tests.builder=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.core.tests.builder
-plugin@org.eclipse.jdt.compiler.apt.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.compiler.apt.tests
-plugin@org.eclipse.jdt.debug.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests
-plugin@org.eclipse.jdt.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.text.tests
-plugin@org.eclipse.jface.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/platform/eclipse.platform.text.git,path=org.eclipse.jface.text.tests
-plugin@org.eclipse.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/platform/eclipse.platform.text.git,path=org.eclipse.text.tests
-plugin@org.eclipse.core.filebuffers.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/platform/eclipse.platform.text.git,path=org.eclipse.core.filebuffers.tests
+plugin@org.eclipse.jdt.core.tests.builder=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.core.tests.builder
+plugin@org.eclipse.jdt.compiler.apt.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.compiler.apt.tests
+plugin@org.eclipse.jdt.debug.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.debug.git,path=org.eclipse.jdt.debug.tests
+plugin@org.eclipse.jdt.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.ui.git,path=org.eclipse.jdt.text.tests
+plugin@org.eclipse.jface.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-platform/eclipse.platform.text.git,path=org.eclipse.jface.text.tests
+plugin@org.eclipse.text.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-platform/eclipse.platform.text.git,path=org.eclipse.text.tests
+plugin@org.eclipse.core.filebuffers.tests=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-platform/eclipse.platform.text.git,path=org.eclipse.core.filebuffers.tests
 
 !-- jdt.annotation: --!
-plugin@org.eclipse.jdt.annotation,2.2.600=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation
-plugin@org.eclipse.jdt.annotation,1.2.0=GIT,tag=@SDK_QUALIFIER@,repo=https://git.eclipse.org/r/jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation_v1
+plugin@org.eclipse.jdt.annotation,2.2.600=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation
+plugin@org.eclipse.jdt.annotation,1.2.0=GIT,tag=@SDK_QUALIFIER@,repo=https://github.com/eclipse-jdt/eclipse.jdt.core.git,path=org.eclipse.jdt.annotation_v1