From 1f9ba2b0eea9daf70515cd36b53c3fe1d2f1e54d Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Tue, 24 Dec 2024 09:47:56 +0100
Subject: [PATCH] Remove workaround for Xtend/Java21 (#4519)

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bundles/org.openhab.core.model.core/.classpath                | 2 +-
 bundles/org.openhab.core.model.item.ide/.classpath            | 2 +-
 bundles/org.openhab.core.model.item.runtime/.classpath        | 2 +-
 bundles/org.openhab.core.model.item/.classpath                | 2 +-
 bundles/org.openhab.core.model.lsp/.classpath                 | 2 +-
 bundles/org.openhab.core.model.persistence.ide/.classpath     | 2 +-
 bundles/org.openhab.core.model.persistence.runtime/.classpath | 2 +-
 bundles/org.openhab.core.model.persistence/.classpath         | 2 +-
 bundles/org.openhab.core.model.rule.ide/.classpath            | 2 +-
 bundles/org.openhab.core.model.rule.runtime/.classpath        | 2 +-
 bundles/org.openhab.core.model.rule/.classpath                | 2 +-
 bundles/org.openhab.core.model.script.ide/.classpath          | 2 +-
 bundles/org.openhab.core.model.script.runtime/.classpath      | 2 +-
 bundles/org.openhab.core.model.script/.classpath              | 2 +-
 bundles/org.openhab.core.model.sitemap.ide/.classpath         | 2 +-
 bundles/org.openhab.core.model.sitemap.runtime/.classpath     | 2 +-
 bundles/org.openhab.core.model.sitemap/.classpath             | 2 +-
 bundles/org.openhab.core.model.thing.ide/.classpath           | 2 +-
 bundles/org.openhab.core.model.thing.runtime/.classpath       | 2 +-
 bundles/org.openhab.core.model.thing/.classpath               | 2 +-
 bundles/pom.xml                                               | 4 ----
 21 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/bundles/org.openhab.core.model.core/.classpath b/bundles/org.openhab.core.model.core/.classpath
index 1cd2b2a1fe0..630dc824124 100644
--- a/bundles/org.openhab.core.model.core/.classpath
+++ b/bundles/org.openhab.core.model.core/.classpath
@@ -12,7 +12,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="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 36b1d5754c9..9c7de1b3b6e 100644
--- a/bundles/org.openhab.core.model.item.ide/.classpath
+++ b/bundles/org.openhab.core.model.item.ide/.classpath
@@ -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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 32b943a7598..bc2f39b85fa 100644
--- a/bundles/org.openhab.core.model.item/.classpath
+++ b/bundles/org.openhab.core.model.item/.classpath
@@ -24,7 +24,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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 02c11764982..a4064beda8e 100644
--- a/bundles/org.openhab.core.model.lsp/.classpath
+++ b/bundles/org.openhab.core.model.lsp/.classpath
@@ -19,7 +19,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="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 36b1d5754c9..9c7de1b3b6e 100644
--- a/bundles/org.openhab.core.model.persistence.ide/.classpath
+++ b/bundles/org.openhab.core.model.persistence.ide/.classpath
@@ -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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 4a684dbe9a2..cb16322db27 100644
--- a/bundles/org.openhab.core.model.persistence/.classpath
+++ b/bundles/org.openhab.core.model.persistence/.classpath
@@ -24,7 +24,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="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 36b1d5754c9..9c7de1b3b6e 100644
--- a/bundles/org.openhab.core.model.rule.ide/.classpath
+++ b/bundles/org.openhab.core.model.rule.ide/.classpath
@@ -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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 4a684dbe9a2..cb16322db27 100644
--- a/bundles/org.openhab.core.model.rule/.classpath
+++ b/bundles/org.openhab.core.model.rule/.classpath
@@ -24,7 +24,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="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 bc038726690..8aabff2a1d3 100644
--- a/bundles/org.openhab.core.model.script.ide/.classpath
+++ b/bundles/org.openhab.core.model.script.ide/.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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 d1858ec850d..7cf7bf4b752 100644
--- a/bundles/org.openhab.core.model.script/.classpath
+++ b/bundles/org.openhab.core.model.script/.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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/org.openhab.core.model.sitemap.ide/.classpath b/bundles/org.openhab.core.model.sitemap.ide/.classpath
index 36b1d5754c9..9c7de1b3b6e 100644
--- a/bundles/org.openhab.core.model.sitemap.ide/.classpath
+++ b/bundles/org.openhab.core.model.sitemap.ide/.classpath
@@ -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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 4a684dbe9a2..cb16322db27 100644
--- a/bundles/org.openhab.core.model.sitemap/.classpath
+++ b/bundles/org.openhab.core.model.sitemap/.classpath
@@ -24,7 +24,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="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 bc038726690..8aabff2a1d3 100644
--- a/bundles/org.openhab.core.model.thing.ide/.classpath
+++ b/bundles/org.openhab.core.model.thing.ide/.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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 87462b3bc68..ef677e9e37e 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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<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 26b34f1d3be..c776b7e1f35 100644
--- a/bundles/org.openhab.core.model.thing/.classpath
+++ b/bundles/org.openhab.core.model.thing/.classpath
@@ -31,7 +31,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-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="annotationpath" value="target/dependency"/>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index a4e835324af..f2ddd17533d 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -277,10 +277,6 @@
           <exists>model.profile-marker</exists>
         </file>
       </activation>
-      <properties>
-        <!-- workaround for Java 21 build, necessary until xtend supports Java 21 -->
-        <maven.compiler.release>17</maven.compiler.release>
-      </properties>
       <dependencies>
         <dependency>
           <groupId>org.openhab.core.bom</groupId>