diff --git a/bundles/org.openhab.core.addon.marketplace.karaf/.classpath b/bundles/org.openhab.core.addon.marketplace.karaf/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.addon.marketplace.karaf/.classpath
+++ b/bundles/org.openhab.core.addon.marketplace.karaf/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.addon.marketplace/.classpath b/bundles/org.openhab.core.addon.marketplace/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.addon.marketplace/.classpath
+++ b/bundles/org.openhab.core.addon.marketplace/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.addon.sample/.classpath b/bundles/org.openhab.core.addon.sample/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.addon.sample/.classpath
+++ b/bundles/org.openhab.core.addon.sample/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.audio/.classpath b/bundles/org.openhab.core.audio/.classpath
index 14ff44d00..4e1320696 100644
--- a/bundles/org.openhab.core.audio/.classpath
+++ b/bundles/org.openhab.core.audio/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.auth.jaas/.classpath b/bundles/org.openhab.core.auth.jaas/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.auth.jaas/.classpath
+++ b/bundles/org.openhab.core.auth.jaas/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.auth.oauth2client/.classpath b/bundles/org.openhab.core.auth.oauth2client/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.auth.oauth2client/.classpath
+++ b/bundles/org.openhab.core.auth.oauth2client/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.automation.module.media/.classpath b/bundles/org.openhab.core.automation.module.media/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.automation.module.media/.classpath
+++ b/bundles/org.openhab.core.automation.module.media/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.automation.module.script.rulesupport/.classpath b/bundles/org.openhab.core.automation.module.script.rulesupport/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.automation.module.script.rulesupport/.classpath
+++ b/bundles/org.openhab.core.automation.module.script.rulesupport/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.automation.module.script/.classpath b/bundles/org.openhab.core.automation.module.script/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.automation.module.script/.classpath
+++ b/bundles/org.openhab.core.automation.module.script/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.automation.rest/.classpath b/bundles/org.openhab.core.automation.rest/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.automation.rest/.classpath
+++ b/bundles/org.openhab.core.automation.rest/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.automation/.classpath b/bundles/org.openhab.core.automation/.classpath
index 0291b82e4..bd5d6308a 100644
--- a/bundles/org.openhab.core.automation/.classpath
+++ b/bundles/org.openhab.core.automation/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.binding.xml/.classpath b/bundles/org.openhab.core.binding.xml/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.binding.xml/.classpath
+++ b/bundles/org.openhab.core.binding.xml/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.core/.classpath b/bundles/org.openhab.core.config.core/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.config.core/.classpath
+++ b/bundles/org.openhab.core.config.core/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery.mdns/.classpath b/bundles/org.openhab.core.config.discovery.mdns/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.discovery.mdns/.classpath
+++ b/bundles/org.openhab.core.config.discovery.mdns/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery.upnp/.classpath b/bundles/org.openhab.core.config.discovery.upnp/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.discovery.upnp/.classpath
+++ b/bundles/org.openhab.core.config.discovery.upnp/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/.classpath b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/.classpath
+++ b/bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/.classpath b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial.ser2net/.classpath
+++ b/bundles/org.openhab.core.config.discovery.usbserial.ser2net/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery.usbserial/.classpath b/bundles/org.openhab.core.config.discovery.usbserial/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.discovery.usbserial/.classpath
+++ b/bundles/org.openhab.core.config.discovery.usbserial/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.discovery/.classpath b/bundles/org.openhab.core.config.discovery/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.config.discovery/.classpath
+++ b/bundles/org.openhab.core.config.discovery/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.dispatch/.classpath b/bundles/org.openhab.core.config.dispatch/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.dispatch/.classpath
+++ b/bundles/org.openhab.core.config.dispatch/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.serial/.classpath b/bundles/org.openhab.core.config.serial/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.serial/.classpath
+++ b/bundles/org.openhab.core.config.serial/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.config.xml/.classpath b/bundles/org.openhab.core.config.xml/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.config.xml/.classpath
+++ b/bundles/org.openhab.core.config.xml/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.ephemeris/.classpath b/bundles/org.openhab.core.ephemeris/.classpath
index 382003817..75c3aee7a 100644
--- a/bundles/org.openhab.core.ephemeris/.classpath
+++ b/bundles/org.openhab.core.ephemeris/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.id/.classpath b/bundles/org.openhab.core.id/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.id/.classpath
+++ b/bundles/org.openhab.core.id/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.bin2json/.classpath b/bundles/org.openhab.core.io.bin2json/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.bin2json/.classpath
+++ b/bundles/org.openhab.core.io.bin2json/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.console.eclipse/.classpath b/bundles/org.openhab.core.io.console.eclipse/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.console.eclipse/.classpath
+++ b/bundles/org.openhab.core.io.console.eclipse/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.console.karaf/.classpath b/bundles/org.openhab.core.io.console.karaf/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.console.karaf/.classpath
+++ b/bundles/org.openhab.core.io.console.karaf/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.console.rfc147/.classpath b/bundles/org.openhab.core.io.console.rfc147/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.console.rfc147/.classpath
+++ b/bundles/org.openhab.core.io.console.rfc147/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.console/.classpath b/bundles/org.openhab.core.io.console/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.console/.classpath
+++ b/bundles/org.openhab.core.io.console/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.http.auth/.classpath b/bundles/org.openhab.core.io.http.auth/.classpath
index 09f8db2fb..ba1118a78 100644
--- a/bundles/org.openhab.core.io.http.auth/.classpath
+++ b/bundles/org.openhab.core.io.http.auth/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.http/.classpath b/bundles/org.openhab.core.io.http/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.http/.classpath
+++ b/bundles/org.openhab.core.io.http/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.jetty.certificate/.classpath b/bundles/org.openhab.core.io.jetty.certificate/.classpath
index 405456d1d..9e55698cd 100644
--- a/bundles/org.openhab.core.io.jetty.certificate/.classpath
+++ b/bundles/org.openhab.core.io.jetty.certificate/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.monitor/.classpath b/bundles/org.openhab.core.io.monitor/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.monitor/.classpath
+++ b/bundles/org.openhab.core.io.monitor/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.net/.classpath b/bundles/org.openhab.core.io.net/.classpath
index 2a0f2f3cc..d33235892 100644
--- a/bundles/org.openhab.core.io.net/.classpath
+++ b/bundles/org.openhab.core.io.net/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.audio/.classpath b/bundles/org.openhab.core.io.rest.audio/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.audio/.classpath
+++ b/bundles/org.openhab.core.io.rest.audio/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.auth/.classpath b/bundles/org.openhab.core.io.rest.auth/.classpath
index 600c3686e..0d0989f15 100644
--- a/bundles/org.openhab.core.io.rest.auth/.classpath
+++ b/bundles/org.openhab.core.io.rest.auth/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.core/.classpath b/bundles/org.openhab.core.io.rest.core/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.core/.classpath
+++ b/bundles/org.openhab.core.io.rest.core/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.log/.classpath b/bundles/org.openhab.core.io.rest.log/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.log/.classpath
+++ b/bundles/org.openhab.core.io.rest.log/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.mdns/.classpath b/bundles/org.openhab.core.io.rest.mdns/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.mdns/.classpath
+++ b/bundles/org.openhab.core.io.rest.mdns/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.sitemap/.classpath b/bundles/org.openhab.core.io.rest.sitemap/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.sitemap/.classpath
+++ b/bundles/org.openhab.core.io.rest.sitemap/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.sse/.classpath b/bundles/org.openhab.core.io.rest.sse/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.sse/.classpath
+++ b/bundles/org.openhab.core.io.rest.sse/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.swagger/.classpath b/bundles/org.openhab.core.io.rest.swagger/.classpath
index 405456d1d..9e55698cd 100644
--- a/bundles/org.openhab.core.io.rest.swagger/.classpath
+++ b/bundles/org.openhab.core.io.rest.swagger/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.transform/.classpath b/bundles/org.openhab.core.io.rest.transform/.classpath
new file mode 100644
index 000000000..9e55698cd
--- /dev/null
+++ b/bundles/org.openhab.core.io.rest.transform/.classpath
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<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="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.openhab.core.io.rest.transform/.project b/bundles/org.openhab.core.io.rest.transform/.project
new file mode 100644
index 000000000..e172467c6
--- /dev/null
+++ b/bundles/org.openhab.core.io.rest.transform/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.core.io.rest.transform</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.openhab.core.io.rest.ui/.classpath b/bundles/org.openhab.core.io.rest.ui/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.ui/.classpath
+++ b/bundles/org.openhab.core.io.rest.ui/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest.voice/.classpath b/bundles/org.openhab.core.io.rest.voice/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest.voice/.classpath
+++ b/bundles/org.openhab.core.io.rest.voice/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.rest/.classpath b/bundles/org.openhab.core.io.rest/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.rest/.classpath
+++ b/bundles/org.openhab.core.io.rest/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.mdns/.classpath b/bundles/org.openhab.core.io.transport.mdns/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.mdns/.classpath
+++ b/bundles/org.openhab.core.io.transport.mdns/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.modbus/.classpath b/bundles/org.openhab.core.io.transport.modbus/.classpath
index 405456d1d..9e55698cd 100644
--- a/bundles/org.openhab.core.io.transport.modbus/.classpath
+++ b/bundles/org.openhab.core.io.transport.modbus/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.mqtt/.classpath b/bundles/org.openhab.core.io.transport.mqtt/.classpath
index ef8eb9b15..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.mqtt/.classpath
+++ b/bundles/org.openhab.core.io.transport.mqtt/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -18,11 +18,6 @@
 			<attribute name="annotationpath" value="target/dependency"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/bundles/org.openhab.core.io.transport.serial.javacomm/.classpath b/bundles/org.openhab.core.io.transport.serial.javacomm/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.serial.javacomm/.classpath
+++ b/bundles/org.openhab.core.io.transport.serial.javacomm/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/.classpath b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/.classpath
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.serial.rxtx/.classpath b/bundles/org.openhab.core.io.transport.serial.rxtx/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.serial.rxtx/.classpath
+++ b/bundles/org.openhab.core.io.transport.serial.rxtx/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.serial/.classpath b/bundles/org.openhab.core.io.transport.serial/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.serial/.classpath
+++ b/bundles/org.openhab.core.io.transport.serial/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.transport.upnp/.classpath b/bundles/org.openhab.core.io.transport.upnp/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.io.transport.upnp/.classpath
+++ b/bundles/org.openhab.core.io.transport.upnp/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.io.websocket/.classpath b/bundles/org.openhab.core.io.websocket/.classpath
new file mode 100644
index 000000000..9e55698cd
--- /dev/null
+++ b/bundles/org.openhab.core.io.websocket/.classpath
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<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="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/bundles/org.openhab.core.io.websocket/.project b/bundles/org.openhab.core.io.websocket/.project
new file mode 100644
index 000000000..c6cad8195
--- /dev/null
+++ b/bundles/org.openhab.core.io.websocket/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.core.io.websocket</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.openhab.core.karaf/.classpath b/bundles/org.openhab.core.karaf/.classpath
index 6c969470d..9e55698cd 100644
--- a/bundles/org.openhab.core.karaf/.classpath
+++ b/bundles/org.openhab.core.karaf/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -18,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.core/.classpath b/bundles/org.openhab.core.model.core/.classpath
index 2b32b5357..faeb20a57 100644
--- a/bundles/org.openhab.core.model.core/.classpath
+++ b/bundles/org.openhab.core.model.core/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.item.ide/.classpath b/bundles/org.openhab.core.model.item.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.item.ide/.classpath
+++ b/bundles/org.openhab.core.model.item.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.item.runtime/.classpath b/bundles/org.openhab.core.model.item.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.item.runtime/.classpath
+++ b/bundles/org.openhab.core.model.item.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.item/.classpath b/bundles/org.openhab.core.model.item/.classpath
index 357c9f8f2..8e23e7deb 100644
--- a/bundles/org.openhab.core.model.item/.classpath
+++ b/bundles/org.openhab.core.model.item/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -17,18 +17,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src-gen">
 		<attributes>
-			<attribute name="annotationpath" value="target/dependency"/>
-			<attribute name="module" value="true"/>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" 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="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="annotationpath" value="target/dependency"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="annotationpath" value="target/dependency"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="notestsources">
diff --git a/bundles/org.openhab.core.model.lazygen/.classpath b/bundles/org.openhab.core.model.lazygen/.classpath
index 2b32b5357..faeb20a57 100644
--- a/bundles/org.openhab.core.model.lazygen/.classpath
+++ b/bundles/org.openhab.core.model.lazygen/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.lsp/.classpath b/bundles/org.openhab.core.model.lsp/.classpath
index f0320c315..aa42b022d 100644
--- a/bundles/org.openhab.core.model.lsp/.classpath
+++ b/bundles/org.openhab.core.model.lsp/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -23,7 +18,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.persistence.ide/.classpath b/bundles/org.openhab.core.model.persistence.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.persistence.ide/.classpath
+++ b/bundles/org.openhab.core.model.persistence.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.persistence.runtime/.classpath b/bundles/org.openhab.core.model.persistence.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.persistence.runtime/.classpath
+++ b/bundles/org.openhab.core.model.persistence.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.persistence/.classpath b/bundles/org.openhab.core.model.persistence/.classpath
index 8d82a9ce3..04c0e5ef3 100644
--- a/bundles/org.openhab.core.model.persistence/.classpath
+++ b/bundles/org.openhab.core.model.persistence/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -23,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.rule.ide/.classpath b/bundles/org.openhab.core.model.rule.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.rule.ide/.classpath
+++ b/bundles/org.openhab.core.model.rule.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.rule.runtime/.classpath b/bundles/org.openhab.core.model.rule.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.rule.runtime/.classpath
+++ b/bundles/org.openhab.core.model.rule.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.rule/.classpath b/bundles/org.openhab.core.model.rule/.classpath
index 8d82a9ce3..04c0e5ef3 100644
--- a/bundles/org.openhab.core.model.rule/.classpath
+++ b/bundles/org.openhab.core.model.rule/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -23,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.script.ide/.classpath b/bundles/org.openhab.core.model.script.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.script.ide/.classpath
+++ b/bundles/org.openhab.core.model.script.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.script.runtime/.classpath b/bundles/org.openhab.core.model.script.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.script.runtime/.classpath
+++ b/bundles/org.openhab.core.model.script.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.script/.classpath b/bundles/org.openhab.core.model.script/.classpath
index e7192c11a..46eddd4c7 100644
--- a/bundles/org.openhab.core.model.script/.classpath
+++ b/bundles/org.openhab.core.model.script/.classpath
@@ -6,28 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src-gen">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**" kind="src" output="target/classes" path="resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="model">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src.moved/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -35,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -47,5 +25,28 @@
 			<attribute name="annotationpath" value="target/dependency"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src-gen">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="resources">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="model">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bundles/org.openhab.core.model.sitemap.ide/.classpath b/bundles/org.openhab.core.model.sitemap.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/.classpath
+++ b/bundles/org.openhab.core.model.sitemap.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.sitemap.runtime/.classpath b/bundles/org.openhab.core.model.sitemap.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.sitemap.runtime/.classpath
+++ b/bundles/org.openhab.core.model.sitemap.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.sitemap/.classpath b/bundles/org.openhab.core.model.sitemap/.classpath
index 8d82a9ce3..04c0e5ef3 100644
--- a/bundles/org.openhab.core.model.sitemap/.classpath
+++ b/bundles/org.openhab.core.model.sitemap/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -23,7 +23,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.thing.ide/.classpath b/bundles/org.openhab.core.model.thing.ide/.classpath
index 4bf140abc..77feb2acc 100644
--- a/bundles/org.openhab.core.model.thing.ide/.classpath
+++ b/bundles/org.openhab.core.model.thing.ide/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -25,7 +25,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.thing.runtime/.classpath b/bundles/org.openhab.core.model.thing.runtime/.classpath
index 5ce171e7a..9221f75da 100644
--- a/bundles/org.openhab.core.model.thing.runtime/.classpath
+++ b/bundles/org.openhab.core.model.thing.runtime/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.thing/.classpath b/bundles/org.openhab.core.model.thing/.classpath
index 9485298c1..d03cae12c 100644
--- a/bundles/org.openhab.core.model.thing/.classpath
+++ b/bundles/org.openhab.core.model.thing/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="xtend-gen">
+	<classpathentry kind="src" output="target/classes" path="xtend-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,7 +30,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.persistence/.classpath b/bundles/org.openhab.core.persistence/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.persistence/.classpath
+++ b/bundles/org.openhab.core.persistence/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.semantics/.classpath b/bundles/org.openhab.core.semantics/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.semantics/.classpath
+++ b/bundles/org.openhab.core.semantics/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.storage.json/.classpath b/bundles/org.openhab.core.storage.json/.classpath
index ef8eb9b15..4e1320696 100644
--- a/bundles/org.openhab.core.storage.json/.classpath
+++ b/bundles/org.openhab.core.storage.json/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -30,5 +30,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bundles/org.openhab.core.test.magic/.classpath b/bundles/org.openhab.core.test.magic/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.test.magic/.classpath
+++ b/bundles/org.openhab.core.test.magic/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.test/.classpath b/bundles/org.openhab.core.test/.classpath
index 405456d1d..0d0989f15 100644
--- a/bundles/org.openhab.core.test/.classpath
+++ b/bundles/org.openhab.core.test/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -25,5 +25,10 @@
 			<attribute name="annotationpath" value="target/dependency"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bundles/org.openhab.core.thing.xml/.classpath b/bundles/org.openhab.core.thing.xml/.classpath
index 2a0f2f3cc..d33235892 100644
--- a/bundles/org.openhab.core.thing.xml/.classpath
+++ b/bundles/org.openhab.core.thing.xml/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.thing/.classpath b/bundles/org.openhab.core.thing/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.thing/.classpath
+++ b/bundles/org.openhab.core.thing/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.transform/.classpath b/bundles/org.openhab.core.transform/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.transform/.classpath
+++ b/bundles/org.openhab.core.transform/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.ui.icon/.classpath b/bundles/org.openhab.core.ui.icon/.classpath
index 4244343f8..58cd399d6 100644
--- a/bundles/org.openhab.core.ui.icon/.classpath
+++ b/bundles/org.openhab.core.ui.icon/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.ui/.classpath b/bundles/org.openhab.core.ui/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.ui/.classpath
+++ b/bundles/org.openhab.core.ui/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.voice/.classpath b/bundles/org.openhab.core.voice/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/bundles/org.openhab.core.voice/.classpath
+++ b/bundles/org.openhab.core.voice/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core/.classpath b/bundles/org.openhab.core/.classpath
index ef8eb9b15..4e1320696 100644
--- a/bundles/org.openhab.core/.classpath
+++ b/bundles/org.openhab.core/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -30,5 +30,11 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/.classpath b/itests/org.openhab.core.auth.oauth2client.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/.classpath
+++ b/itests/org.openhab.core.auth.oauth2client.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.automation.integration.tests/.classpath b/itests/org.openhab.core.automation.integration.tests/.classpath
index 0291b82e4..bd5d6308a 100644
--- a/itests/org.openhab.core.automation.integration.tests/.classpath
+++ b/itests/org.openhab.core.automation.integration.tests/.classpath
@@ -11,7 +11,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.automation.module.core.tests/.classpath b/itests/org.openhab.core.automation.module.core.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.automation.module.core.tests/.classpath
+++ b/itests/org.openhab.core.automation.module.core.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.automation.module.script.tests/.classpath b/itests/org.openhab.core.automation.module.script.tests/.classpath
index 6c969470d..e339dde65 100644
--- a/itests/org.openhab.core.automation.module.script.tests/.classpath
+++ b/itests/org.openhab.core.automation.module.script.tests/.classpath
@@ -18,7 +18,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.automation.module.timer.tests/.classpath b/itests/org.openhab.core.automation.module.timer.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/.classpath
+++ b/itests/org.openhab.core.automation.module.timer.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.automation.tests/.classpath b/itests/org.openhab.core.automation.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.automation.tests/.classpath
+++ b/itests/org.openhab.core.automation.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.binding.xml.tests/.classpath b/itests/org.openhab.core.binding.xml.tests/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/itests/org.openhab.core.binding.xml.tests/.classpath
+++ b/itests/org.openhab.core.binding.xml.tests/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.core.tests/.classpath b/itests/org.openhab.core.config.core.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.config.core.tests/.classpath
+++ b/itests/org.openhab.core.config.core.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/.classpath b/itests/org.openhab.core.config.discovery.mdns.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/.classpath
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.discovery.tests/.classpath b/itests/org.openhab.core.config.discovery.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.config.discovery.tests/.classpath
+++ b/itests/org.openhab.core.config.discovery.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/.classpath b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/.classpath
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/.classpath b/itests/org.openhab.core.config.discovery.usbserial.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/.classpath
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.dispatch.tests/.classpath b/itests/org.openhab.core.config.dispatch.tests/.classpath
index d5a8e32c5..688153fa9 100644
--- a/itests/org.openhab.core.config.dispatch.tests/.classpath
+++ b/itests/org.openhab.core.config.dispatch.tests/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.config.xml.tests/.classpath b/itests/org.openhab.core.config.xml.tests/.classpath
index d5a8e32c5..688153fa9 100644
--- a/itests/org.openhab.core.config.xml.tests/.classpath
+++ b/itests/org.openhab.core.config.xml.tests/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.ephemeris.tests/.classpath b/itests/org.openhab.core.ephemeris.tests/.classpath
index 600c3686e..0d0989f15 100644
--- a/itests/org.openhab.core.ephemeris.tests/.classpath
+++ b/itests/org.openhab.core.ephemeris.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.io.rest.core.tests/.classpath b/itests/org.openhab.core.io.rest.core.tests/.classpath
index 4244343f8..58cd399d6 100644
--- a/itests/org.openhab.core.io.rest.core.tests/.classpath
+++ b/itests/org.openhab.core.io.rest.core.tests/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.core.tests/.classpath b/itests/org.openhab.core.model.core.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.model.core.tests/.classpath
+++ b/itests/org.openhab.core.model.core.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.item.tests/.classpath b/itests/org.openhab.core.model.item.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.model.item.tests/.classpath
+++ b/itests/org.openhab.core.model.item.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.rule.tests/.classpath b/itests/org.openhab.core.model.rule.tests/.classpath
index 4244343f8..58cd399d6 100644
--- a/itests/org.openhab.core.model.rule.tests/.classpath
+++ b/itests/org.openhab.core.model.rule.tests/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.script.tests/.classpath b/itests/org.openhab.core.model.script.tests/.classpath
index 4d0b04e45..d3d6b3c11 100644
--- a/itests/org.openhab.core.model.script.tests/.classpath
+++ b/itests/org.openhab.core.model.script.tests/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.thing.tests/.classpath b/itests/org.openhab.core.model.thing.tests/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.model.thing.tests/.classpath
+++ b/itests/org.openhab.core.model.thing.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.model.thing.testsupport/.classpath b/itests/org.openhab.core.model.thing.testsupport/.classpath
index 405456d1d..9e55698cd 100644
--- a/itests/org.openhab.core.model.thing.testsupport/.classpath
+++ b/itests/org.openhab.core.model.thing.testsupport/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.storage.json.tests/.classpath b/itests/org.openhab.core.storage.json.tests/.classpath
index 405456d1d..0d0989f15 100644
--- a/itests/org.openhab.core.storage.json.tests/.classpath
+++ b/itests/org.openhab.core.storage.json.tests/.classpath
@@ -13,7 +13,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
@@ -25,5 +25,10 @@
 			<attribute name="annotationpath" value="target/dependency"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/itests/org.openhab.core.tests/.classpath b/itests/org.openhab.core.tests/.classpath
index d5a8e32c5..688153fa9 100644
--- a/itests/org.openhab.core.tests/.classpath
+++ b/itests/org.openhab.core.tests/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.thing.tests/.classpath b/itests/org.openhab.core.thing.tests/.classpath
index 6c969470d..e339dde65 100644
--- a/itests/org.openhab.core.thing.tests/.classpath
+++ b/itests/org.openhab.core.thing.tests/.classpath
@@ -18,7 +18,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.thing.xml.tests/.classpath b/itests/org.openhab.core.thing.xml.tests/.classpath
index ef8eb9b15..ef503e68b 100644
--- a/itests/org.openhab.core.thing.xml.tests/.classpath
+++ b/itests/org.openhab.core.thing.xml.tests/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/itests/org.openhab.core.voice.tests/.classpath b/itests/org.openhab.core.voice.tests/.classpath
index 4244343f8..58cd399d6 100644
--- a/itests/org.openhab.core.voice.tests/.classpath
+++ b/itests/org.openhab.core.voice.tests/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/tools/i18n-plugin/.classpath b/tools/i18n-plugin/.classpath
index 0fb79cfe6..3b58aced1 100644
--- a/tools/i18n-plugin/.classpath
+++ b/tools/i18n-plugin/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -24,7 +19,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-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>