diff --git a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
index 85775ec2628..07ad4e3d40c 100644
--- a/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.apt.core; singleton:=true
-Bundle-Version: 3.8.500.qualifier
+Bundle-Version: 3.8.600.qualifier
 Bundle-Localization: plugin
 Export-Package: com.sun.mirror.apt,
  com.sun.mirror.declaration,
@@ -18,7 +18,7 @@ Export-Package: com.sun.mirror.apt,
  org.eclipse.jdt.apt.core.internal.type;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
  org.eclipse.jdt.apt.core.internal.util;x-friends:="org.eclipse.jdt.apt.pluggable.core,org.eclipse.jdt.apt.tests,org.eclipse.jdt.apt.ui,org.eclipse.jdt.apt.pluggable.tests",
  org.eclipse.jdt.apt.core.util
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.21.0,4.0.0)",
  org.apache.ant;bundle-version="1.6.5"
diff --git a/org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF
index 722e0e78315..03be673e3b1 100644
--- a/org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.pluggable.core/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jdt.apt.core,
  org.eclipse.core.resources,
- org.eclipse.jdt.core;bundle-version="3.36.0"
+ org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.jdt.internal.apt.pluggable.core;x-internal:=true,
  org.eclipse.jdt.internal.apt.pluggable.core.dispatch;x-internal:=true,
diff --git a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
index eb20fc68430..7c6403b9e7e 100644
--- a/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.pluggable.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.junit,
  org.eclipse.jdt.core.tests.builder,
  org.eclipse.jdt.core.tests.compiler,
  org.eclipse.test.performance,
- org.eclipse.jdt.core;bundle-version="3.38.0",
+ org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.ui.ide,
  org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
diff --git a/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
index 2f98d5aa3bf..472290598a0 100644
--- a/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 3.8.400.qualifier
 Bundle-Activator: org.eclipse.jdt.apt.ui.internal.AptUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jdt.apt.core;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.14.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.33.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
diff --git a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
index 5ac17b373bf..935a43ecfd9 100644
--- a/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.compiler.tool.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.compiler.tool.tests
-Bundle-Version: 1.4.500.qualifier
+Bundle-Version: 1.4.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.jdt.core;bundle-version="3.36.0",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.junit,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.jdt.compiler.tool.tests/pom.xml b/org.eclipse.jdt.compiler.tool.tests/pom.xml
index 6c00329131c..f74bb6b1a7e 100644
--- a/org.eclipse.jdt.compiler.tool.tests/pom.xml
+++ b/org.eclipse.jdt.compiler.tool.tests/pom.xml
@@ -19,7 +19,7 @@
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <artifactId>org.eclipse.jdt.compiler.tool.tests</artifactId>
-  <version>1.4.500-SNAPSHOT</version>
+  <version>1.4.600-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
   	<testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.jdt.core.formatterapp/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.formatterapp/META-INF/MANIFEST.MF
index f96fd1304f5..c3a587e7122 100644
--- a/org.eclipse.jdt.core.formatterapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.formatterapp/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.formatterapp;singleton:=true
-Bundle-Version: 1.2.250.qualifier
+Bundle-Version: 1.2.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.jdt.core.formatterapp
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
+Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="[3.13.700,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
index b4557f59bf8..bc00fbfe540 100644
--- a/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.builder/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.core.tests.builder
 Import-Package: org.eclipse.jdt.core.tests.builder.mockcompiler
 Require-Bundle: org.junit;bundle-version="3.8.1",
- org.eclipse.jdt.core;bundle-version="[3.36.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.jdt.core.tests.compiler;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.21.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
index 79488883b5e..b4db246297f 100644
--- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Export-Package: org.eclipse.jdt.core.tests.compiler,
  org.eclipse.jdt.core.tests.runtime,
  org.eclipse.jdt.core.tests.util
 Require-Bundle: org.junit;bundle-version="3.8.1",
- org.eclipse.jdt.debug;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.debug;bundle-version="[3.21.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.test;bundle-version="[3.6.0,4.0.0)",
diff --git a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
index cd9d17569e0..0cfafbd6ec2 100644
--- a/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.performance/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.jdt.core.tests.performance,
  org.eclipse.jdt.core.tests.performance.util
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.20.100,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.30.100,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.37.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.40.0,4.0.0)",
  org.eclipse.jdt.core.tests.builder;bundle-version="[3.12.300,4.0.0)",
  org.eclipse.jdt.core.tests.compiler;bundle-version="[3.13.300,4.0.0)",
  org.eclipse.jdt.core.tests.model;bundle-version="[3.12.300,4.0.0)",