diff --git a/debug/org.eclipse.debug.examples.memory/.classpath b/debug/org.eclipse.debug.examples.memory/.classpath
index 81fe078c20c..375961e4d61 100644
--- a/debug/org.eclipse.debug.examples.memory/.classpath
+++ b/debug/org.eclipse.debug.examples.memory/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs
index a92c0a388a8..d8bf8d58a01 100644
--- a/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs
+++ b/debug/org.eclipse.debug.examples.memory/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -136,7 +136,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
index 1b7be53c980..53b492634d1 100644
--- a/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.examples.memory/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.debug.examples.memory;singleton:=true
-Bundle-Version: 1.104.0.qualifier
+Bundle-Version: 1.105.0.qualifier
 Bundle-Activator: org.eclipse.debug.examples.internal.memory.MemoryViewSamplePlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
@@ -18,5 +18,5 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.core.resources,
  org.eclipse.jface.text
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.debug.examples.memory
diff --git a/debug/org.eclipse.debug.ui.launchview/.classpath b/debug/org.eclipse.debug.ui.launchview/.classpath
index 81fe078c20c..375961e4d61 100644
--- a/debug/org.eclipse.debug.ui.launchview/.classpath
+++ b/debug/org.eclipse.debug.ui.launchview/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.jdt.core.prefs
index 624b47ed8fb..14ed21223e5 100644
--- a/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.jdt.core.prefs
+++ b/debug/org.eclipse.debug.ui.launchview/.settings/org.eclipse.jdt.core.prefs
@@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
index 80a1dfbe524..a7966e01fb5 100644
--- a/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.ui.launchview/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.debug.ui.launchview;singleton:=true
-Bundle-Version: 1.1.900.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="3.208.0",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.debug.ui,
  org.eclipse.e4.core.di.annotations,
  org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.services
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: jakarta.annotation;version="[2.0.0,3.0.0)",
  jakarta.inject;version="[2.0.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/debug/org.eclipse.debug.ui/.classpath b/debug/org.eclipse.debug.ui/.classpath
index 0512bb524dc..e66047cb09b 100644
--- a/debug/org.eclipse.debug.ui/.classpath
+++ b/debug/org.eclipse.debug.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="ui"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/debug/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
index 2024046eb24..0c360c276c2 100644
--- a/debug/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/debug/org.eclipse.debug.ui/.settings/org.eclipse.jdt.core.prefs
@@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -140,7 +140,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL,HIGH,HIGH
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,EXPERIMENTAL,CONTEXTLAUNCHING
diff --git a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
index f574f83f49f..b4cbecb0922 100644
--- a/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.debug.ui/META-INF/MANIFEST.MF
@@ -80,7 +80,7 @@ Export-Package: org.eclipse.debug.internal.ui;
  org.eclipse.debug.ui.sourcelookup,
  org.eclipse.debug.ui.stringsubstitution
 Require-Bundle: org.eclipse.core.variables;bundle-version="[3.2.800,4.0.0)",
- org.eclipse.ui;bundle-version="[3.115.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.208.0,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.9.0,4.0.0)";visibility:=reexport,
@@ -93,6 +93,6 @@ Require-Bundle: org.eclipse.core.variables;bundle-version="[3.2.800,4.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.3.700,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui.forms.widgets
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.debug.ui
 Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/team/examples/org.eclipse.compare.examples.xml/.classpath b/team/examples/org.eclipse.compare.examples.xml/.classpath
index 509acd28af6..737f0ece063 100644
--- a/team/examples/org.eclipse.compare.examples.xml/.classpath
+++ b/team/examples/org.eclipse.compare.examples.xml/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin_tests" path="tests">
diff --git a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs
index 52474ae6a06..d9036c978d6 100644
--- a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs
+++ b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs
@@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -136,6 +136,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index bfa414c0213..0d5d6a02de2 100644
--- a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.6.500.qualifier
+Bundle-Version: 3.7.0.qualifier
 Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,9 +11,9 @@ Export-Package: org.eclipse.compare.examples.xml,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.compare,
- org.eclipse.ui,
+ org.eclipse.ui;bundle-version="3.208.0",
  org.eclipse.jface.text,
  org.junit
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.compare.examples.xml
diff --git a/team/examples/org.eclipse.compare.examples.xml/pom.xml b/team/examples/org.eclipse.compare.examples.xml/pom.xml
index 32fe9cd8c98..551c992cf5c 100644
--- a/team/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/team/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -18,6 +18,6 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.compare.examples.xml</artifactId>
-  <version>3.6.500-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/team/examples/org.eclipse.compare.examples/.classpath b/team/examples/org.eclipse.compare.examples/.classpath
index 81fe078c20c..375961e4d61 100644
--- a/team/examples/org.eclipse.compare.examples/.classpath
+++ b/team/examples/org.eclipse.compare.examples/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs
index e1965428bdc..9e93f389530 100644
--- a/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/team/examples/org.eclipse.compare.examples/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -68,6 +68,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
index 95475649746..0ac0448452e 100644
--- a/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
+++ b/team/examples/org.eclipse.compare.examples/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples; singleton:=true
-Bundle-Version: 3.4.500.qualifier
+Bundle-Version: 3.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.compare.examples.structurecreator
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui;bundle-version="3.208.0",
  org.eclipse.core.resources,
  org.eclipse.compare,
  org.eclipse.jface.text,
  org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.compare.examples
diff --git a/team/examples/org.eclipse.compare.examples/pom.xml b/team/examples/org.eclipse.compare.examples/pom.xml
index 1503ce5a31d..bc10e42348e 100644
--- a/team/examples/org.eclipse.compare.examples/pom.xml
+++ b/team/examples/org.eclipse.compare.examples/pom.xml
@@ -18,6 +18,6 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.compare.examples</artifactId>
-  <version>3.4.500-SNAPSHOT</version>
+  <version>3.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/team/tests/org.eclipse.compare.tests/.classpath b/team/tests/org.eclipse.compare.tests/.classpath
index 675a5e2962b..1aa9eca95a0 100644
--- a/team/tests/org.eclipse.compare.tests/.classpath
+++ b/team/tests/org.eclipse.compare.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs
index ad2f46b4d6e..107de1f7059 100644
--- a/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/team/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs
@@ -18,9 +18,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -135,6 +135,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
index 33ddc5aceee..5e3085ad993 100644
--- a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
+++ b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true
-Bundle-Version: 3.8.900.qualifier
+Bundle-Version: 3.9.0.qualifier
 Require-Bundle: org.eclipse.compare,
  org.eclipse.jface.text,
  org.eclipse.jface,
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.test.performance,
- org.eclipse.ui,
+ org.eclipse.ui;bundle-version="3.208.0",
  org.eclipse.core.resources,
  org.eclipse.core.tests.resources,
  org.eclipse.core.tests.harness,
@@ -22,7 +22,7 @@ Import-Package: org.assertj.core.api,
 Bundle-Activator: org.eclipse.compare.tests.CompareTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Localization: plugin
 Export-Package: org.eclipse.compare.tests,
  org.eclipse.compare.tests.performance
diff --git a/team/tests/org.eclipse.team.tests.core/.classpath b/team/tests/org.eclipse.team.tests.core/.classpath
index 675a5e2962b..1aa9eca95a0 100644
--- a/team/tests/org.eclipse.team.tests.core/.classpath
+++ b/team/tests/org.eclipse.team.tests.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs b/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs
index cb82fe181cf..d2c72f33ee9 100644
--- a/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs
+++ b/team/tests/org.eclipse.team.tests.core/.settings/org.eclipse.jdt.core.prefs
@@ -19,9 +19,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -124,6 +124,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
index a191a8cd873..d2ee1cdb4b6 100644
--- a/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
+++ b/team/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.tests.core; singleton:=true
-Bundle-Version: 3.10.600.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.tests.core,
@@ -33,5 +33,5 @@ Import-Package: org.assertj.core.api,
  org.junit.platform.suite.api;version="[1.14.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.eclipse.team.tests.core
diff --git a/team/tests/org.eclipse.team.tests.core/pom.xml b/team/tests/org.eclipse.team.tests.core/pom.xml
index 4a0c8fcf803..2f4aabb9578 100644
--- a/team/tests/org.eclipse.team.tests.core/pom.xml
+++ b/team/tests/org.eclipse.team.tests.core/pom.xml
@@ -17,7 +17,7 @@
     <version>4.39.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.team.tests.core</artifactId>
-  <version>3.10.600-SNAPSHOT</version>
+  <version>3.11.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/ua/org.eclipse.tips.feature/feature.xml b/ua/org.eclipse.tips.feature/feature.xml
index 7b7f1c004c0..3ba387be4ac 100644
--- a/ua/org.eclipse.tips.feature/feature.xml
+++ b/ua/org.eclipse.tips.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.tips.feature"
       label="%featureName"
-      version="0.4.700.qualifier"
+      version="0.4.800.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/ua/org.eclipse.tips.ide/.classpath b/ua/org.eclipse.tips.ide/.classpath
index 81fe078c20c..375961e4d61 100644
--- a/ua/org.eclipse.tips.ide/.classpath
+++ b/ua/org.eclipse.tips.ide/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ua/org.eclipse.tips.ide/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.tips.ide/.settings/org.eclipse.jdt.core.prefs
index c73c35cc0ce..b075e380604 100644
--- a/ua/org.eclipse.tips.ide/.settings/org.eclipse.jdt.core.prefs
+++ b/ua/org.eclipse.tips.ide/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index 9d91a2f3c0e..5c98adb7366 100644
--- a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
 Automatic-Module-Name: org.eclipse.tips.ide
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.3.600.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
+Bundle-Version: 0.4.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-21
+Require-Bundle: org.eclipse.ui;bundle-version="3.208.0",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="3.0.0",
  org.eclipse.e4.ui.workbench;bundle-version="1.0.0",
diff --git a/ua/org.eclipse.tips.tests/.classpath b/ua/org.eclipse.tips.tests/.classpath
index 675a5e2962b..1aa9eca95a0 100644
--- a/ua/org.eclipse.tips.tests/.classpath
+++ b/ua/org.eclipse.tips.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>
diff --git a/ua/org.eclipse.tips.tests/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.tips.tests/.settings/org.eclipse.jdt.core.prefs
index 1237aa4c10d..26c657d6cf5 100644
--- a/ua/org.eclipse.tips.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/ua/org.eclipse.tips.tests/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -111,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/ua/org.eclipse.tips.tests/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.tests/META-INF/MANIFEST.MF
index eff594da88c..f663bcc36af 100644
--- a/ua/org.eclipse.tips.tests/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.tips.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tip of the Day Tests
 Bundle-SymbolicName: org.eclipse.tips.tests
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.tips.ide;bundle-version="0.1.0",
  org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.swt,
- org.eclipse.jface;bundle-version="3.12.0",
+ org.eclipse.jface;bundle-version="3.39.0",
  org.eclipse.tips.core;bundle-version="0.1.0",
  org.eclipse.tips.ui;bundle-version="0.1.0",
  org.eclipse.tips.json;bundle-version="0.1.0"
diff --git a/ua/org.eclipse.tips.ui/.classpath b/ua/org.eclipse.tips.ui/.classpath
index 81fe078c20c..375961e4d61 100644
--- a/ua/org.eclipse.tips.ui/.classpath
+++ b/ua/org.eclipse.tips.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/ua/org.eclipse.tips.ui/.settings/org.eclipse.jdt.core.prefs b/ua/org.eclipse.tips.ui/.settings/org.eclipse.jdt.core.prefs
index 5b32566a82f..217b6c57bb3 100644
--- a/ua/org.eclipse.tips.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/ua/org.eclipse.tips.ui/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -111,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
diff --git a/ua/org.eclipse.tips.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.ui/META-INF/MANIFEST.MF
index 6ca2c1a1ec4..6ce7b127df7 100644
--- a/ua/org.eclipse.tips.ui/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.tips.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.tips.ui;singleton:=true
-Bundle-Version: 0.3.600.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-Version: 0.4.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
- org.eclipse.jface;bundle-version="3.30.0",
+ org.eclipse.jface;bundle-version="3.39.0",
  org.eclipse.tips.core;bundle-version="0.1.0"
 Export-Package: org.eclipse.tips.ui,
  org.eclipse.tips.ui.internal,