diff --git a/org.eclipse.xtend.core/pom.xml b/org.eclipse.xtend.core/pom.xml
index 17c284f0cdd..0899a13a4f5 100644
--- a/org.eclipse.xtend.core/pom.xml
+++ b/org.eclipse.xtend.core/pom.xml
@@ -35,15 +35,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 
diff --git a/org.eclipse.xtext.builder.standalone/pom.xml b/org.eclipse.xtext.builder.standalone/pom.xml
index 3f51f19ee18..5fb69313f96 100644
--- a/org.eclipse.xtext.builder.standalone/pom.xml
+++ b/org.eclipse.xtext.builder.standalone/pom.xml
@@ -32,15 +32,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.eclipse.xtext.common.types.tests/pom.xml b/org.eclipse.xtext.common.types.tests/pom.xml
index fc19098f139..31962400d13 100644
--- a/org.eclipse.xtext.common.types.tests/pom.xml
+++ b/org.eclipse.xtext.common.types.tests/pom.xml
@@ -57,15 +57,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.google.errorprone</groupId>
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index 8a1cb8fc688..b74710c116e 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -261,28 +261,23 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-				<version>1.4.200</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
-				<version>1.3.200</version>
+				<artifactId>ecj</artifactId>
+				<version>3.33.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.core</artifactId>
-				<version>3.31.0</version>
+				<version>3.33.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.debug</artifactId>
-				<version>3.19.300</version>
+				<version>3.20.100</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.launching</artifactId>
-				<version>3.19.700</version>
+				<version>3.19.900</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.lsp4j</groupId>
@@ -322,7 +317,7 @@
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.core.commands</artifactId>
-				<version>3.10.200</version>
+				<version>3.10.400</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
@@ -342,17 +337,17 @@
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.core.jobs</artifactId>
-				<version>3.13.100</version>
+				<version>3.13.300</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.core.resources</artifactId>
-				<version>3.18.0</version>
+				<version>3.18.200</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.core.runtime</artifactId>
-				<version>3.26.0</version>
+				<version>3.26.100</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
@@ -362,7 +357,7 @@
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.debug.core</artifactId>
-				<version>3.20.0</version>
+				<version>3.20.100</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
@@ -372,12 +367,12 @@
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.equinox.common</artifactId>
-				<version>3.16.200</version>
+				<version>3.17.100</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.equinox.preferences</artifactId>
-				<version>3.10.100</version>
+				<version>3.10.200</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
@@ -387,12 +382,12 @@
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
-				<version>3.18.100</version>
+				<version>3.18.300</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.platform</groupId>
 				<artifactId>org.eclipse.text</artifactId>
-				<version>3.12.200</version>
+				<version>3.12.300</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.xpand</groupId>
diff --git a/org.eclipse.xtext.java/pom.xml b/org.eclipse.xtext.java/pom.xml
index 2f3bcbcdc1e..88c3dcd704f 100644
--- a/org.eclipse.xtext.java/pom.xml
+++ b/org.eclipse.xtext.java/pom.xml
@@ -27,15 +27,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml
index d93cd75d1c5..9192537082b 100644
--- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml
+++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/bug463946/pom.xml
@@ -95,13 +95,13 @@
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.core</artifactId>
+						<artifactId>ecj</artifactId>
 						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-						<version>${jdt-compiler-apt-version}</version>
+						<artifactId>org.eclipse.jdt.core</artifactId>
+						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
index bdb82b6076a..5cc02f6a6e9 100644
--- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
+++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
@@ -16,9 +16,9 @@
 			the current version of our project -->
 		<xtext-version>@project.version@</xtext-version>
 		<tycho-version>2.7.5</tycho-version>
-		<eclipse-text-version>3.12.200</eclipse-text-version>
-		<core-resources-version>3.18.0</core-resources-version>
-		<core-runtime-version>3.26.0</core-runtime-version>
+		<eclipse-text-version>3.12.300</eclipse-text-version>
+		<core-resources-version>3.18.200</core-resources-version>
+		<core-runtime-version>3.26.100</core-runtime-version>
 		<emf-common-version>2.24.0</emf-common-version>
 		<emf-ecore-version>2.26.0</emf-ecore-version>
 		<emf-edit-version>2.17.0</emf-edit-version>
@@ -29,9 +29,8 @@
 		<ecore-xcore-version>1.20.0</ecore-xcore-version>
 		<ecore-xcore-lib-version>1.6.0</ecore-xcore-lib-version>
 		<ecore-xtext-version>1.6.0</ecore-xtext-version>
-		<jdt-core-version>3.31.0</jdt-core-version>
-		<jdt-compiler-apt-version>1.4.200</jdt-compiler-apt-version>
-		<platform-osgi-version>3.18.100</platform-osgi-version>
+		<jdt-core-version>3.33.0</jdt-core-version>
+		<platform-osgi-version>3.18.300</platform-osgi-version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml
index 7abb54795b0..6e042f1d7d8 100644
--- a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml
+++ b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-lang/pom.xml
@@ -97,13 +97,13 @@
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.core</artifactId>
+						<artifactId>ecj</artifactId>
 						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.jdt</groupId>
-						<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-						<version>${jdt-compiler-apt-version}</version>
+						<artifactId>org.eclipse.jdt.core</artifactId>
+						<version>${jdt-core-version}</version>
 					</dependency>
 					<dependency>
 						<groupId>org.eclipse.emf</groupId>
diff --git a/org.eclipse.xtext.xbase.testing/pom.xml b/org.eclipse.xtext.xbase.testing/pom.xml
index 7091e8bfe0d..8cc46406b80 100644
--- a/org.eclipse.xtext.xbase.testing/pom.xml
+++ b/org.eclipse.xtext.xbase.testing/pom.xml
@@ -36,15 +36,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
+			<artifactId>ecj</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.compiler.tool</artifactId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
 		</dependency>
 	</dependencies>
 </project>