From 5dcba73241b374ad5b775bcef14a78a2afcb09f1 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 22 Apr 2024 17:42:09 +0200
Subject: [PATCH] Adapt to xtext 2.35.0.M0

* xtext 2.35.0.M0
* Resolve itest runbundles

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile-model/pom.xml                     |  2 +-
 bom/runtime/pom.xml                           |  4 +--
 .../openhab-core/src/main/feature/feature.xml |  4 +--
 .../openhab-tp/src/main/feature/feature.xml   |  4 +--
 .../org.openhab.core.addon.tests/itest.bndrun | 12 ++++----
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              |  8 ++---
 .../itest.bndrun                              | 30 +++++++++----------
 .../itest.bndrun                              | 28 ++++++++---------
 .../itest.bndrun                              | 28 ++++++++---------
 .../itest.bndrun                              | 28 ++++++++---------
 .../itest.bndrun                              |  8 ++---
 itests/org.openhab.core.tests/itest.bndrun    |  8 ++---
 .../org.openhab.core.thing.tests/itest.bndrun |  8 ++---
 .../org.openhab.core.voice.tests/itest.bndrun |  8 ++---
 pom.xml                                       |  2 +-
 29 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index 26712fe5ec4..9c17f4e93e9 100644
--- a/bom/compile-model/pom.xml
+++ b/bom/compile-model/pom.xml
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.8.165</version>
+      <version>4.8.168</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 80d4d97b809..0b70f529841 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -794,7 +794,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.0.0-jre</version>
+      <version>33.1.0-jre</version>
       <scope>compile</scope>
     </dependency>
 
@@ -808,7 +808,7 @@
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.8.165</version>
+      <version>4.8.168</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index ab4089ad00c..ede5c730e12 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -28,7 +28,7 @@
 
 		<feature dependency="true">openhab.tp-gson</feature>
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.34.0)(!(version&gt;=2.35.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.35.0)(!(version&gt;=2.36.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext</feature>
 
 		<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -389,7 +389,7 @@
 
 	<feature name="openhab-core-model-lsp" version="${project.version}">
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.34.0)(!(version&gt;=2.35.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.35.0)(!(version&gt;=2.36.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext-ide</feature>
 
 		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.22.0)(!(version&gt;=0.23.0)))"</requirement>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 46fff5dae51..c382cfff34d 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -247,12 +247,12 @@
 		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>
 
 		<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.2</bundle>
-		<bundle dependency="true">mvn:com.google.guava/guava/33.0.0-jre</bundle>
+		<bundle dependency="true">mvn:com.google.guava/guava/33.1.0-jre</bundle>
 		<bundle dependency="true">mvn:com.google.inject/guice/7.0.0</bundle>
 		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
 
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
-		<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.165</bundle>
+		<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.168</bundle>
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
 
 		<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 0dd6bc95484..e3281222fae 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -62,9 +62,9 @@ Fragment-Host: org.openhab.core.addon
 	org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
-	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
+	org.objectweb.asm;version='[9.7.0,9.7.1)'
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index accd378681b..c4e1943563e 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -74,8 +74,8 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index e8685bf15f3..85114e96db5 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -75,10 +75,10 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
index cf5ac29d2d9..dba40230c22 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -75,10 +75,10 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
index 724d986ea8a..d6bbc51644b 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -72,10 +72,10 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
index 2d7014b896a..09771523257 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -75,10 +75,10 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 5619a7187f8..bdacb248a69 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -75,10 +75,10 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 66205114328..d3618c421cd 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -64,8 +64,8 @@ Fragment-Host: org.openhab.core.config.core
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
index aacdb86df19..051543d738e 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -71,8 +71,8 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 1dfb27019db..46bf1a9387e 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -70,8 +70,8 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
index 127972d4b7f..8cb12f13180 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
@@ -71,8 +71,8 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
index dd215b90c1d..f87053e1f90 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -79,8 +79,8 @@ Provide-Capability: \
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 22e384e836d..8d99f4bafe5 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -57,8 +57,8 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 483ea63820c..36b33a596f7 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -70,10 +70,10 @@ feature.openhab-config: \
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index a8da38c0d4e..47652c4bbb2 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -69,8 +69,8 @@ Fragment-Host: org.openhab.core.io.net
 	org.eclipse.jetty.websocket.server;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.servlet;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
index facada153ae..677a0bd0f33 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -97,10 +97,10 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index e3742bdcf0d..7950e7258ab 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -85,13 +85,13 @@ Fragment-Host: org.openhab.core.model.item
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.0.0,33.0.1)',\
+	com.google.guava;version='[33.1.0,33.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
-	io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\
+	io.github.classgraph.classgraph;version='[4.8.168,4.8.169)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
-	org.apache.log4j;version='[2.23.1,2.23.2)',\
+	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
@@ -109,23 +109,23 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
-	org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\
+	org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[8.0.27,8.0.28)',\
-	org.ops4j.pax.web.pax-web-spi;version='[8.0.27,8.0.28)',\,\
+	org.ops4j.pax.web.pax-web-spi;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.27,8.0.28)',\
 	de.focus_shift.jollyday-core;version='[0.27.0,0.27.1)',\
 	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 83859d75388..f53166f89f2 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -89,12 +89,12 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.0.0,33.0.1)',\
+	com.google.guava;version='[33.1.0,33.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
-	io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\
+	io.github.classgraph.classgraph;version='[4.8.168,4.8.169)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
-	org.apache.log4j;version='[2.23.1,2.23.2)',\
+	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
@@ -112,18 +112,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
-	org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\
+	org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index 5da64e88aa8..215e92a3465 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -93,12 +93,12 @@ Fragment-Host: org.openhab.core.model.script
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.0.0,33.0.1)',\
+	com.google.guava;version='[33.1.0,33.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
-	io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\
+	io.github.classgraph.classgraph;version='[4.8.168,4.8.169)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
-	org.apache.log4j;version='[2.23.1,2.23.2)',\
+	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
@@ -116,18 +116,18 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
-	org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\
+	org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index ed94cf0349a..e2d4fee4111 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -94,13 +94,13 @@ Fragment-Host: org.openhab.core.model.thing
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.16.0,2.16.1)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
-	com.google.guava;version='[33.0.0,33.0.1)',\
+	com.google.guava;version='[33.1.0,33.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
-	io.github.classgraph.classgraph;version='[4.8.165,4.8.166)',\
+	io.github.classgraph.classgraph;version='[4.8.168,4.8.169)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
-	org.apache.log4j;version='[2.23.1,2.23.2)',\
+	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
@@ -118,18 +118,18 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.jetty.websocket.client;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
-	org.eclipse.xtend.lib;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.common.types;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.util;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase;version='[2.34.0,2.34.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.34.0,2.34.1)',\
+	org.eclipse.xtend.lib;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.common.types;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.util;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase;version='[2.35.0,2.35.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.35.0,2.35.1)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index 42842d6d0f0..2b4f869cf45 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -64,8 +64,8 @@ Fragment-Host: org.openhab.core.storage.json
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index c024328a61a..a81bc05f1e3 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -61,8 +61,8 @@ Fragment-Host: org.openhab.core
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index d8aafb6981d..2dd6f9847f4 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -72,8 +72,8 @@ Fragment-Host: org.openhab.core.thing
 	org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 64fe514a5f0..0358154ab8f 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -72,10 +72,10 @@ Fragment-Host: org.openhab.core.voice
 	org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
 	org.eclipse.jetty.xml;version='[9.4.54,9.4.55)',\
 	org.objectweb.asm;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.commons;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.tree.analysis;version='[9.7.0,9.7.1)',\
-	org.objectweb.asm.util;version='[9.7.0,9.7.1)',\
+	org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
+	org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
 	org.ops4j.pax.web.pax-web-api;version='[8.0.27,8.0.28)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[8.0.27,8.0.28)',\
diff --git a/pom.xml b/pom.xml
index 5cdec3a9d48..5a3aefa58c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <karaf.tooling.version>4.4.6</karaf.tooling.version>
     <sat.version>0.16.0</sat.version>
     <slf4j.version>2.0.12</slf4j.version>
-    <xtext.version>2.34.0</xtext.version>
+    <xtext.version>2.35.0.M0</xtext.version>
     <spotless.version>2.43.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->
     <spotless.eclipse.version>4.25</spotless.eclipse.version>