From fffa968263a9a76ded98a18792291b43643c362e Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sun, 1 Oct 2023 22:04:27 +0200
Subject: [PATCH] Upgrade Xtext/Xtend to 2.32.0, LSP4J to 0.21.0 (#3817)

Upgrades Xtext and its dependencies to:

* Xtext/Xtend 2.32.0
* LSP4J 0.21.0
* GSON 2.10.1
* Guava 32.1.2
* Guice 7.0.0

For release notes, see:

https://eclipse.dev/Xtext/releasenotes.html#/releasenotes/2023/08/27/version-2-32-0

Fixes #3321

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bom/compile-model/pom.xml                     | 18 -------
 bom/compile/pom.xml                           |  7 +--
 bom/runtime/pom.xml                           | 20 ++-----
 .../openhab-core/src/main/feature/feature.xml |  6 +--
 .../openhab-tp/src/main/feature/feature.xml   | 54 +++++++++----------
 .../org.openhab.core.addon.tests/itest.bndrun |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              |  6 +--
 .../itest.bndrun                              | 30 +++++------
 .../itest.bndrun                              | 30 +++++------
 .../itest.bndrun                              | 30 +++++------
 .../itest.bndrun                              | 30 +++++------
 .../itest.bndrun                              |  6 +--
 itests/org.openhab.core.tests/itest.bndrun    |  6 +--
 .../org.openhab.core.thing.tests/itest.bndrun |  6 +--
 .../org.openhab.core.voice.tests/itest.bndrun |  6 +--
 pom.xml                                       |  2 +-
 30 files changed, 158 insertions(+), 189 deletions(-)

diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index 30b86ed6cd6..1e978a5f069 100644
--- a/bom/compile-model/pom.xml
+++ b/bom/compile-model/pom.xml
@@ -83,12 +83,6 @@
     <dependency>
       <groupId>org.eclipse.emf</groupId>
       <artifactId>org.eclipse.emf.mwe2.launch</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.inject</groupId>
-          <artifactId>guice</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -144,14 +138,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <!-- Guice -->
-    <dependency>
-      <groupId>org.eclipse.orbit.bundles</groupId>
-      <artifactId>com.google.inject</artifactId>
-      <version>5.0.1.v20210324-2015</version>
-      <scope>compile</scope>
-    </dependency>
-
     <!-- TEST -->
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
@@ -163,10 +149,6 @@
           <groupId>org.eclipse.platform</groupId>
           <artifactId>org.eclipse.osgi</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.google.inject</groupId>
-          <artifactId>guice</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index f849b2c12a3..bdf45233ffd 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -117,10 +117,11 @@
     </dependency>
 
     <!-- Gson -->
+    <!-- The Orbit bundle is used because LSP4J imports com.google.gson.internal -->
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.9.1</version>
+      <groupId>org.eclipse.orbit.bundles</groupId>
+      <artifactId>com.google.gson</artifactId>
+      <version>2.10.1.v20230109-0753</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index b905ef530e4..622207f6db8 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -443,9 +443,9 @@
 
     <!-- Gson -->
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.9.1</version>
+      <groupId>org.eclipse.orbit.bundles</groupId>
+      <artifactId>com.google.gson</artifactId>
+      <version>2.10.1.v20230109-0753</version>
       <scope>compile</scope>
     </dependency>
 
@@ -789,7 +789,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.1-jre</version>
+      <version>32.1.2-jre</version>
       <scope>compile</scope>
     </dependency>
 
@@ -849,12 +849,6 @@
       <artifactId>org.eclipse.xtext</artifactId>
       <version>${xtext.version}</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.inject</groupId>
-          <artifactId>guice</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
@@ -885,12 +879,6 @@
       <artifactId>org.eclipse.xtext.util</artifactId>
       <version>${xtext.version}</version>
       <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.inject</groupId>
-          <artifactId>guice</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.xtext</groupId>
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index 9cd839b2cbf..5cdcf866a1e 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.29.0)(!(version&gt;=2.30.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext</feature>
 
 		<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -352,10 +352,10 @@
 
 	<feature name="openhab-core-model-lsp" version="${project.version}">
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.32.0)(!(version&gt;=2.33.0)))"</requirement>
 		<feature dependency="true">openhab.tp-xtext-ide</feature>
 
-		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.19.0)(!(version&gt;=0.20.0)))"</requirement>
+		<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.21.0)(!(version&gt;=0.22.0)))"</requirement>
 		<feature dependency="true">openhab.tp-lsp4j</feature>
 
 		<feature>openhab-core-model-item-ide</feature>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 6b0d43da969..cdf424fc1e1 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -24,10 +24,9 @@
 		<feature>pax-web-jetty-extras</feature>
 		<!-- Apache Commons -->
 		<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.12.0</bundle>
-
 		<!-- Measurement -->
 		<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
-		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.0</bundle>
+		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
 		<bundle dependency="true">mvn:javax.measure/unit-api/2.2</bundle>
 		<!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
 		<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.1</bundle>
@@ -55,8 +54,8 @@
 	</feature>
 
 	<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
-		<capability>openhab.tp;feature=gson;version=2.9.1</capability>
-		<bundle>mvn:com.google.code.gson/gson/2.9.1</bundle>
+		<capability>openhab.tp;feature=gson;version=2.10.1</capability>
+		<bundle>mvn:org.eclipse.orbit.bundles/com.google.gson/2.10.1.v20230109-0753</bundle>
 	</feature>
 
 	<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
@@ -198,9 +197,9 @@
 	</feature>
 
 	<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
-		<capability>openhab.tp;feature=lsp4j;version=0.19.0</capability>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.19.0</bundle>
-		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0</bundle>
+		<capability>openhab.tp;feature=lsp4j;version=0.21.0</capability>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.21.0</bundle>
+		<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.21.0</bundle>
 
 		<feature dependency="true">openhab.tp-gson</feature>
 		<feature dependency="true">openhab.tp-xtext</feature>
@@ -220,50 +219,49 @@
 	</feature>
 
 	<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
-		<capability>openhab.tp;feature=xtext;version=2.29.0</capability>
+		<capability>openhab.tp;feature=xtext;version=${xtext.version}</capability>
 
-		<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.29.0</bundle>
+		<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/${xtext.version}</bundle>
 
-		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.24.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.26.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/${xtext.version}</bundle>
 
 		<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
 
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/${xtext.version}</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/${xtext.version}</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/${xtext.version}</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/${xtext.version}</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
+		<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.1</bundle>
-		<bundle dependency="true">mvn:com.google.guava/guava/30.1-jre</bundle>
-		<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
+		<bundle dependency="true">mvn:com.google.guava/guava/32.1.2-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:org.eclipse.orbit.bundles/com.google.inject/5.0.1.v20210324-2015</bundle>
 		<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556</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.13.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.9.0</bundle>
 		<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
 
-		<!-- Add ASM package -->
-		<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
-		<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.4</bundle>
+		<!-- Used for feature verification only because this is already provided by Karaf -->
+		<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.18.0</bundle>
 	</feature>
 
 	<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
-		<capability>openhab.tp;feature=xtext-ide;version=2.29.0</capability>
+		<capability>openhab.tp;feature=xtext-ide;version=${xtext.version}</capability>
 		<feature dependency="true">openhab.tp-xtext</feature>
 
 		<!-- Support for the Language Server Protocol -->
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.29.0</bundle>
-		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.29.0</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/${xtext.version}</bundle>
+		<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/${xtext.version}</bundle>
 	</feature>
 
 	<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 94f22d89a20..e7248d32b4e 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.core.addon
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -60,11 +59,12 @@ Fragment-Host: org.openhab.core.addon
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index cbe8e4c66f7..29b0a7a78f9 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -68,11 +67,12 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 24c2da2b17c..6f972acc8b4 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.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 4e1b52ffb00..68f670a8f2a 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.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 1aeddd4a618..288244ad76f 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -63,11 +62,12 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.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 e11bb2f194a..f25114937e5 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 9659fd5022d..30bb63297dc 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -23,7 +23,6 @@ Fragment-Host: org.openhab.core.automation
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.automation
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index bd13b2510fa..003140113c3 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.config.core
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -61,11 +60,12 @@ Fragment-Host: org.openhab.core.config.core
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
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 f98535a2a3e..fae608590c9 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	javax.jmdns;version='[3.5.8,3.5.9)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index bcfb5f7a2d7..9e36b90a437 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -65,11 +64,12 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
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 ac8c6634c34..db3061a1a0f 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
@@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -66,11 +65,12 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
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 37e444c1541..1a6aff53440 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -31,7 +31,6 @@ Provide-Capability: \
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -74,11 +73,12 @@ Provide-Capability: \
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 722d6db159d..acc4be34925 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -54,11 +53,12 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index a24f20f88e2..125d983e43e 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -28,7 +28,6 @@ feature.openhab-config: \
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -63,11 +62,12 @@ feature.openhab-config: \
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 42789b0c4cc..64d6032cf3c 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.io.net
 
 -runbundles: \
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	junit-jupiter-api;version='[5.9.2,5.9.3)',\
@@ -31,7 +30,6 @@ Fragment-Host: org.openhab.core.io.net
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
@@ -73,4 +71,6 @@ Fragment-Host: org.openhab.core.io.net
 	org.eclipse.jetty.websocket.servlet;version='[9.4.52,9.4.53)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
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 cdbdda5ede2..31276e27e40 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -29,8 +29,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -104,4 +102,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 6ea19f1c247..91ced2f5a11 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -22,28 +22,14 @@ Fragment-Host: org.openhab.core.model.item
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
-	org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.guava;version='[30.1.0,30.1.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	com.google.inject;version='[5.0.1,5.0.2)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
-	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
-	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
@@ -119,4 +105,18 @@ Fragment-Host: org.openhab.core.model.item
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
+	com.google.inject;version='[7.0.0,7.0.1)',\
+	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
+	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
+	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
+	org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index f467334c6e6..a3397dbac54 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -26,28 +26,14 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
-	org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.guava;version='[30.1.0,30.1.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	com.google.inject;version='[5.0.1,5.0.2)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
-	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
-	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -123,4 +109,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
+	com.google.inject;version='[7.0.0,7.0.1)',\
+	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
+	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
+	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
+	org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index a7ac5da32d1..7d4908606e6 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -25,28 +25,14 @@ Fragment-Host: org.openhab.core.model.script
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
-	org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.guava;version='[30.1.0,30.1.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	com.google.inject;version='[5.0.1,5.0.2)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
-	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
-	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -126,4 +112,18 @@ Fragment-Host: org.openhab.core.model.script
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
+	com.google.inject;version='[7.0.0,7.0.1)',\
+	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
+	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
+	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
+	org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 9cd68607916..aed2bfa9a75 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -23,28 +23,14 @@ Fragment-Host: org.openhab.core.model.thing
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.emf.common;version='[2.17.0,2.17.1)',\
-	org.eclipse.emf.ecore;version='[2.20.0,2.20.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	com.google.guava;version='[30.1.0,30.1.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
-	com.google.inject;version='[5.0.1,5.0.2)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
-	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
-	org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
@@ -128,4 +114,18 @@ Fragment-Host: org.openhab.core.model.thing
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
+	com.google.inject;version='[7.0.0,7.0.1)',\
+	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
+	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
+	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
+	org.eclipse.xtend.lib;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.common.types;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index a5938e603a3..a2541cc2315 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.storage.json
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -59,11 +58,12 @@ Fragment-Host: org.openhab.core.storage.json
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index ba95bf1416f..81c31308b21 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -58,11 +57,12 @@ Fragment-Host: org.openhab.core
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 048b7521043..bf6c408365e 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.core.thing
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -67,11 +66,12 @@ Fragment-Host: org.openhab.core.thing
 	org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.util;version='[9.4.0,9.4.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 0a3408e5c74..9fe918aa333 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.core.voice
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
@@ -67,7 +66,6 @@ Fragment-Host: org.openhab.core.voice
 	org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\
 	org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\
-	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\
 	org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\
@@ -79,4 +77,6 @@ Fragment-Host: org.openhab.core.voice
 	org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\
 	org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
-	org.osgi.util.promise;version='[1.3.0,1.3.1)'
+	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	org.objectweb.asm;version='[9.5.0,9.5.1)'
diff --git a/pom.xml b/pom.xml
index 1e91f7fc1bf..70dfe85ed5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <karaf.tooling.version>4.4.4</karaf.tooling.version>
     <sat.version>0.15.0</sat.version>
     <slf4j.version>2.0.6</slf4j.version>
-    <xtext.version>2.29.0</xtext.version>
+    <xtext.version>2.32.0</xtext.version>
     <spotless.version>2.38.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->
     <spotless.eclipse.version>4.25</spotless.eclipse.version>