diff --git a/cnf/build.bnd b/cnf/build.bnd
index eaa02afe8..4c2d6890b 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,7 +1,7 @@
 -includeresource.all                  =         -src/main/resources
 -donotcopy                            =         \.gitignore|\.DS_Store
 
-javac.source                          =         17
+javac.source                          =         21
 javac.target                          =         ${javac.source}
 javac.compliance                      =         ${javac.source}
 javac.debug                           =         on
diff --git a/cnf/ext/launcher.bnd b/cnf/ext/launcher.bnd
index 8bde12406..ac56cfc5a 100644
--- a/cnf/ext/launcher.bnd
+++ b/cnf/ext/launcher.bnd
@@ -2,7 +2,7 @@
 -runfw                          =         org.eclipse.osgi;version=latest
 -runkeep                        =         ${is;${driver};gradle}
 -runtrace                       =         true 
--runee                          =         JavaSE-17
+-runee                          =         JavaSE-21
 -runsystemcapabilities          =         ${native_capability}
 -runproperties.scr              =         ds.log.enabled=false
 
diff --git a/com.osgifx.console.api/.classpath b/com.osgifx.console.api/.classpath
index 5551f2e2d..0290d81bf 100644
--- a/com.osgifx.console.api/.classpath
+++ b/com.osgifx.console.api/.classpath
@@ -8,7 +8,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.api/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.api/.settings/org.eclipse.jdt.core.prefs
index 9478cb165..1e0cb16bb 100644
--- a/com.osgifx.console.api/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.api/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 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
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.application/.classpath b/com.osgifx.console.application/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.application/.classpath
+++ b/com.osgifx.console.application/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.application/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.application/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.application/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.application/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.assets.common/.classpath b/com.osgifx.console.assets.common/.classpath
index 5551f2e2d..0290d81bf 100644
--- a/com.osgifx.console.assets.common/.classpath
+++ b/com.osgifx.console.assets.common/.classpath
@@ -8,7 +8,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.assets.common/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.assets.common/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..92dd3c26a 100644
--- a/com.osgifx.console.assets.common/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.assets.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.bnd.dp.packager/.classpath b/com.osgifx.console.bnd.dp.packager/.classpath
index 7af6998af..1a54333e6 100644
--- a/com.osgifx.console.bnd.dp.packager/.classpath
+++ b/com.osgifx.console.bnd.dp.packager/.classpath
@@ -7,11 +7,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
\ No newline at end of file
+</classpath>
diff --git a/com.osgifx.console.bnd.dp.packager/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.bnd.dp.packager/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..92dd3c26a 100644
--- a/com.osgifx.console.bnd.dp.packager/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.bnd.dp.packager/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.data.provider/.classpath b/com.osgifx.console.data.provider/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.data.provider/.classpath
+++ b/com.osgifx.console.data.provider/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.data.provider/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.data.provider/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.data.provider/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.data.provider/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.dist/.classpath b/com.osgifx.console.dist/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.dist/.classpath
+++ b/com.osgifx.console.dist/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.dist/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.dist/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.dist/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.dist/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.executor/.classpath b/com.osgifx.console.executor/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.executor/.classpath
+++ b/com.osgifx.console.executor/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.executor/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.executor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..3a79233b1
--- /dev/null
+++ b/com.osgifx.console.executor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.extension.dp.tictactoe/.classpath b/com.osgifx.console.extension.dp.tictactoe/.classpath
index 323407fad..4056d6a06 100644
--- a/com.osgifx.console.extension.dp.tictactoe/.classpath
+++ b/com.osgifx.console.extension.dp.tictactoe/.classpath
@@ -7,11 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.osgifx.console.extension.dp.tictactoe/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.extension.dp.tictactoe/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..1e0cb16bb 100644
--- a/com.osgifx.console.extension.dp.tictactoe/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.extension.dp.tictactoe/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+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
@@ -11,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.extension.ui.tictactoe/.classpath b/com.osgifx.console.extension.ui.tictactoe/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.extension.ui.tictactoe/.classpath
+++ b/com.osgifx.console.extension.ui.tictactoe/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.extension.ui.tictactoe/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.extension.ui.tictactoe/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..1e0cb16bb 100644
--- a/com.osgifx.console.extension.ui.tictactoe/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.extension.ui.tictactoe/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+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
@@ -11,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.launcher/.classpath b/com.osgifx.console.launcher/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.launcher/.classpath
+++ b/com.osgifx.console.launcher/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.launcher/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.launcher/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.launcher/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.launcher/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.product/.classpath b/com.osgifx.console.product/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.product/.classpath
+++ b/com.osgifx.console.product/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.product/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.product/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.product/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.product/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.smartgraph/.classpath b/com.osgifx.console.smartgraph/.classpath
index 323407fad..4056d6a06 100644
--- a/com.osgifx.console.smartgraph/.classpath
+++ b/com.osgifx.console.smartgraph/.classpath
@@ -7,11 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.osgifx.console.smartgraph/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.smartgraph/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..1e0cb16bb 100644
--- a/com.osgifx.console.smartgraph/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.smartgraph/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+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
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.supervisor/.classpath b/com.osgifx.console.supervisor/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.supervisor/.classpath
+++ b/com.osgifx.console.supervisor/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.supervisor/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.supervisor/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.supervisor/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.supervisor/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.templates/.classpath b/com.osgifx.console.templates/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.templates/.classpath
+++ b/com.osgifx.console.templates/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.templates/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.templates/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..92dd3c26a 100644
--- a/com.osgifx.console.templates/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.batchinstall/.classpath b/com.osgifx.console.ui.batchinstall/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.batchinstall/.classpath
+++ b/com.osgifx.console.ui.batchinstall/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.batchinstall/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.batchinstall/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.batchinstall/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.batchinstall/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.bundles/.classpath b/com.osgifx.console.ui.bundles/.classpath
index 323407fad..4056d6a06 100644
--- a/com.osgifx.console.ui.bundles/.classpath
+++ b/com.osgifx.console.ui.bundles/.classpath
@@ -7,11 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/com.osgifx.console.ui.bundles/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.bundles/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.bundles/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.bundles/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/obr/bnd/ResourceUtils.java b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/obr/bnd/ResourceUtils.java
index 6df277f8d..20b9cfca1 100644
--- a/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/obr/bnd/ResourceUtils.java
+++ b/com.osgifx.console.ui.bundles/src/main/java/com/osgifx/console/ui/bundles/obr/bnd/ResourceUtils.java
@@ -33,7 +33,6 @@
 import java.io.File;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -262,9 +261,8 @@ public static URI getURI(final Capability contentCapability) {
             }
             if (uriObj instanceof final String uri) {
                 try {
-                    final var url = new URL(uri);
-                    return url.toURI();
-                } catch (final MalformedURLException mfue) {
+                    return URI.create(uri);
+                } catch (final IllegalArgumentException iae) {
                     // Ignore
                 }
                 final var f = new File((String) uriObj);
diff --git a/com.osgifx.console.ui.components/.classpath b/com.osgifx.console.ui.components/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.components/.classpath
+++ b/com.osgifx.console.ui.components/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.components/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.components/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.components/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.components/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.configurations/.classpath b/com.osgifx.console.ui.configurations/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.configurations/.classpath
+++ b/com.osgifx.console.ui.configurations/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.configurations/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.configurations/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.configurations/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.configurations/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.dmt/.classpath b/com.osgifx.console.ui.dmt/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.dmt/.classpath
+++ b/com.osgifx.console.ui.dmt/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.dmt/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.dmt/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.dmt/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.dmt/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.dto/.classpath b/com.osgifx.console.ui.dto/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.dto/.classpath
+++ b/com.osgifx.console.ui.dto/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.dto/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.dto/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.dto/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.dto/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.events/.classpath b/com.osgifx.console.ui.events/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.events/.classpath
+++ b/com.osgifx.console.ui.events/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.events/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.events/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.events/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.events/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.extension/.classpath b/com.osgifx.console.ui.extension/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.extension/.classpath
+++ b/com.osgifx.console.ui.extension/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.extension/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.extension/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.extension/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.extension/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.gogo/.classpath b/com.osgifx.console.ui.gogo/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.gogo/.classpath
+++ b/com.osgifx.console.ui.gogo/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.gogo/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.gogo/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.gogo/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.gogo/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.graph/.classpath b/com.osgifx.console.ui.graph/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.graph/.classpath
+++ b/com.osgifx.console.ui.graph/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.graph/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.graph/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.graph/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.graph/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.healthchecks/.classpath b/com.osgifx.console.ui.healthchecks/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.healthchecks/.classpath
+++ b/com.osgifx.console.ui.healthchecks/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.healthchecks/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.healthchecks/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.healthchecks/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.healthchecks/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.heap/.classpath b/com.osgifx.console.ui.heap/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.heap/.classpath
+++ b/com.osgifx.console.ui.heap/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.heap/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.heap/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.heap/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.heap/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.http/.classpath b/com.osgifx.console.ui.http/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.http/.classpath
+++ b/com.osgifx.console.ui.http/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.http/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.http/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.http/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.http/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.leaks/.classpath b/com.osgifx.console.ui.leaks/.classpath
index 4bf28327a..89c36d012 100644
--- a/com.osgifx.console.ui.leaks/.classpath
+++ b/com.osgifx.console.ui.leaks/.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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.leaks/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.leaks/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..92dd3c26a 100644
--- a/com.osgifx.console.ui.leaks/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.leaks/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.logs/.classpath b/com.osgifx.console.ui.logs/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.logs/.classpath
+++ b/com.osgifx.console.ui.logs/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.logs/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.logs/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.logs/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.logs/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.overview/.classpath b/com.osgifx.console.ui.overview/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.overview/.classpath
+++ b/com.osgifx.console.ui.overview/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.overview/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.overview/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.overview/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.overview/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.packages/.classpath b/com.osgifx.console.ui.packages/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.packages/.classpath
+++ b/com.osgifx.console.ui.packages/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.packages/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.packages/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.packages/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.packages/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.properties/.classpath b/com.osgifx.console.ui.properties/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.properties/.classpath
+++ b/com.osgifx.console.ui.properties/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.properties/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.properties/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.properties/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.roles/.classpath b/com.osgifx.console.ui.roles/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.roles/.classpath
+++ b/com.osgifx.console.ui.roles/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.roles/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.roles/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.roles/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.roles/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.search/.classpath b/com.osgifx.console.ui.search/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.search/.classpath
+++ b/com.osgifx.console.ui.search/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.search/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.search/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.search/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.search/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.services/.classpath b/com.osgifx.console.ui.services/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.services/.classpath
+++ b/com.osgifx.console.ui.services/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.services/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.services/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.services/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.services/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.snapshot/.classpath b/com.osgifx.console.ui.snapshot/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.snapshot/.classpath
+++ b/com.osgifx.console.ui.snapshot/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.snapshot/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.snapshot/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..3a79233b1
--- /dev/null
+++ b/com.osgifx.console.ui.snapshot/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.terminal/.classpath b/com.osgifx.console.ui.terminal/.classpath
index 4bf28327a..89c36d012 100644
--- a/com.osgifx.console.ui.terminal/.classpath
+++ b/com.osgifx.console.ui.terminal/.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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.terminal/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.terminal/.settings/org.eclipse.jdt.core.prefs
index 8c9943d50..92dd3c26a 100644
--- a/com.osgifx.console.ui.terminal/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.terminal/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-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
@@ -11,4 +11,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.ui.threads/.classpath b/com.osgifx.console.ui.threads/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.ui.threads/.classpath
+++ b/com.osgifx.console.ui.threads/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.ui.threads/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.ui.threads/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.ui.threads/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.ui.threads/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.util/.classpath b/com.osgifx.console.util/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.util/.classpath
+++ b/com.osgifx.console.util/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.util/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.util/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.util/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/com.osgifx.console.wrapper/.classpath b/com.osgifx.console.wrapper/.classpath
index 323407fad..1a54333e6 100644
--- a/com.osgifx.console.wrapper/.classpath
+++ b/com.osgifx.console.wrapper/.classpath
@@ -7,7 +7,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/com.osgifx.console.wrapper/.settings/org.eclipse.jdt.core.prefs b/com.osgifx.console.wrapper/.settings/org.eclipse.jdt.core.prefs
index d4540a53f..3a79233b1 100644
--- a/com.osgifx.console.wrapper/.settings/org.eclipse.jdt.core.prefs
+++ b/com.osgifx.console.wrapper/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21