From f3560c882a17ee4fa03f35f2b8abeb6f86415bc6 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 6 May 2024 08:17:09 +0200
Subject: [PATCH] Adapt to xtext 2.35.0.M1

* xtext 2.35.0.M1
* Additional library upgrades
* Resolve itest runbundles

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile-model/pom.xml                              |  2 +-
 bom/compile/pom.xml                                    |  6 +++---
 bom/runtime/pom.xml                                    | 10 +++++-----
 bom/test/pom.xml                                       |  2 +-
 bundles/org.openhab.core.io.console.eclipse/pom.xml    |  2 +-
 bundles/org.openhab.core.io.transport.modbus/pom.xml   |  2 +-
 bundles/org.openhab.core.model.item/pom.xml            |  4 ++--
 bundles/org.openhab.core.model.persistence/pom.xml     |  4 ++--
 bundles/org.openhab.core.model.rule/pom.xml            |  4 ++--
 bundles/org.openhab.core.model.script/pom.xml          |  4 ++--
 bundles/org.openhab.core.model.sitemap/pom.xml         |  4 ++--
 bundles/org.openhab.core.model.thing/pom.xml           |  4 ++--
 bundles/pom.xml                                        |  2 +-
 .../karaf/openhab-core/src/main/feature/feature.xml    |  2 +-
 features/karaf/openhab-tp/src/main/feature/feature.xml | 10 +++++-----
 itests/org.openhab.core.addon.tests/itest.bndrun       |  2 +-
 .../itest.bndrun                                       |  2 +-
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 itests/org.openhab.core.automation.tests/itest.bndrun  |  4 ++--
 itests/org.openhab.core.config.core.tests/itest.bndrun |  2 +-
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  4 ++--
 .../itest.bndrun                                       |  2 +-
 itests/org.openhab.core.ephemeris.tests/itest.bndrun   |  2 +-
 itests/org.openhab.core.io.net.tests/itest.bndrun      |  2 +-
 .../org.openhab.core.io.rest.core.tests/itest.bndrun   |  8 ++++----
 itests/org.openhab.core.model.item.tests/itest.bndrun  |  9 +++++----
 itests/org.openhab.core.model.rule.tests/itest.bndrun  |  9 +++++----
 .../org.openhab.core.model.script.tests/itest.bndrun   |  9 +++++----
 itests/org.openhab.core.model.thing.tests/itest.bndrun |  6 +++---
 .../org.openhab.core.storage.json.tests/itest.bndrun   |  4 ++--
 itests/org.openhab.core.tests/itest.bndrun             |  2 +-
 itests/org.openhab.core.thing.tests/itest.bndrun       |  4 ++--
 itests/org.openhab.core.voice.tests/itest.bndrun       |  4 ++--
 pom.xml                                                |  3 ++-
 tools/upgradetool/pom.xml                              |  2 +-
 41 files changed, 87 insertions(+), 83 deletions(-)

diff --git a/bom/compile-model/pom.xml b/bom/compile-model/pom.xml
index 9c17f4e93e9..fd690836e48 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.168</version>
+      <version>4.8.172</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index de06f9ed352..278788e544f 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -37,12 +37,12 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-      <version>1.2</version>
+      <version>1.3.2</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 0b70f529841..78045e18664 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.metatype</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.1</version>
       <scope>compile</scope>
     </dependency>
 
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>org.apache.aries.jax.rs</groupId>
       <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.2</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -808,7 +808,7 @@
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.8.168</version>
+      <version>4.8.172</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index 6c9aefcc6d4..7f648515808 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.aries.jax.rs</groupId>
       <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.2</version>
       <exclusions>
         <exclusion>
           <groupId>ch.qos.logback</groupId>
diff --git a/bundles/org.openhab.core.io.console.eclipse/pom.xml b/bundles/org.openhab.core.io.console.eclipse/pom.xml
index b20abd2d1f3..2c63ed25a92 100644
--- a/bundles/org.openhab.core.io.console.eclipse/pom.xml
+++ b/bundles/org.openhab.core.io.console.eclipse/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
-      <version>3.13.100</version>
+      <version>3.18.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.core.io.transport.modbus/pom.xml b/bundles/org.openhab.core.io.transport.modbus/pom.xml
index 53fa26f0fd1..3acf7d3d0ba 100644
--- a/bundles/org.openhab.core.io.transport.modbus/pom.xml
+++ b/bundles/org.openhab.core.io.transport.modbus/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-pool2</artifactId>
-      <version>2.8.1</version>
+      <version>2.11.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/bundles/org.openhab.core.model.item/pom.xml b/bundles/org.openhab.core.model.item/pom.xml
index 59379ead2b0..2602b7db764 100644
--- a/bundles/org.openhab.core.model.item/pom.xml
+++ b/bundles/org.openhab.core.model.item/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml
index 20ed6956f4a..02c9b4f40c5 100644
--- a/bundles/org.openhab.core.model.persistence/pom.xml
+++ b/bundles/org.openhab.core.model.persistence/pom.xml
@@ -67,12 +67,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.rule/pom.xml b/bundles/org.openhab.core.model.rule/pom.xml
index 4beb1f8d27b..9655da3b367 100644
--- a/bundles/org.openhab.core.model.rule/pom.xml
+++ b/bundles/org.openhab.core.model.rule/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.script/pom.xml b/bundles/org.openhab.core.model.script/pom.xml
index 92736aaa273..ef108b12f91 100644
--- a/bundles/org.openhab.core.model.script/pom.xml
+++ b/bundles/org.openhab.core.model.script/pom.xml
@@ -103,12 +103,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.sitemap/pom.xml b/bundles/org.openhab.core.model.sitemap/pom.xml
index 4e76aa43fd3..5b19e647b98 100644
--- a/bundles/org.openhab.core.model.sitemap/pom.xml
+++ b/bundles/org.openhab.core.model.sitemap/pom.xml
@@ -62,12 +62,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/org.openhab.core.model.thing/pom.xml b/bundles/org.openhab.core.model.thing/pom.xml
index bd63f8b49d9..3b1a32c3c38 100644
--- a/bundles/org.openhab.core.model.thing/pom.xml
+++ b/bundles/org.openhab.core.model.thing/pom.xml
@@ -85,12 +85,12 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>${slf4j-for-model.version}</version>
           </dependency>
           <dependency>
             <groupId>org.antlr</groupId>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 935f02a144a..d83958afe9b 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -235,7 +235,7 @@
                 <!-- Required for JDK 17 compatibility, see: https://github.com/highsource/maven-jaxb2-plugin/issues/207 -->
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
-                <version>2.3.6</version>
+                <version>2.3.8</version>
               </dependency>
             </dependencies>
             <executions>
diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml
index e567bab3c1b..9f55be0cd79 100644
--- a/features/karaf/openhab-core/src/main/feature/feature.xml
+++ b/features/karaf/openhab-core/src/main/feature/feature.xml
@@ -250,7 +250,7 @@
 		<feature>openhab-core-base</feature>
 		<feature>openhab-transport-serial</feature>
 
-		<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.8.1</bundle>
+		<bundle dependency="true">mvn:org.apache.commons/commons-pool2/2.11.1</bundle>
 		<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.transport.modbus/${project.version}</bundle>
 	</feature>
 
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index c382cfff34d..c0826312317 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -34,7 +34,7 @@
 		<bundle dependency="true">mvn:tech.units/indriya/2.2</bundle>
 		<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.2</bundle>
 		<bundle dependency="true">mvn:org.apiguardian/apiguardian-api/1.1.2</bundle>
-		<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.0</bundle>
+		<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.1</bundle>
 
 		<!-- TODO: Unbundled libraries -->
 		<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/1.4.20</bundle>
@@ -96,7 +96,7 @@
 	</feature>
 
 	<feature name="openhab.tp-jax-rs-whiteboard" description="Aries JAX-RS Whiteboard" version="${project.version}">
-		<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.0</capability>
+		<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.2</capability>
 		<feature dependency="true">spifly</feature>
 		<feature dependency="true">http-whiteboard</feature>
 		<feature dependency="true">openhab.tp-cxf</feature>
@@ -105,7 +105,7 @@
 		<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.3.0</bundle>
 		<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.1</bundle>
 		<bundle>mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/1.2.2</bundle>
-		<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0</bundle>
+		<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.2</bundle>
 	</feature>
 
 	<feature name="openhab.tp-jna" description="Java Native Access (JNA)" version="${project.version}">
@@ -237,7 +237,7 @@
 		<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/${xtext.version}</bundle>
 
-		<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
+		<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.3.2</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>
@@ -252,7 +252,7 @@
 		<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.168</bundle>
+		<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.172</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 e3281222fae..15093aed46f 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -25,7 +25,7 @@ Fragment-Host: org.openhab.core.addon
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)'
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index c4e1943563e..b30869a0199 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 85114e96db5..5901c5d96e6 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.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 dba40230c22..24aaf778af3 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.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 d6bbc51644b..e50f13bcba0 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
@@ -54,7 +54,7 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.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 09771523257..32491f5c10f 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index bdacb248a69..9608a6f3c90 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -57,7 +57,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index d3618c421cd..f5b0e64d1c6 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
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 051543d738e..9f27a4b7d58 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,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	javax.jmdns;version='[3.5.9,3.5.10)',\
 	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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -59,7 +59,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 46bf1a9387e..0583d1ccbd4 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -58,7 +58,7 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.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 8cb12f13180..c2e925b5309 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,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -59,7 +59,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.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 f87053e1f90..45cbb9c5405 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,7 @@ Provide-Capability: \
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -67,7 +67,7 @@ Provide-Capability: \
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)'
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 8d99f4bafe5..4988772c6b3 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 36b33a596f7..e24cc863bd5 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -26,7 +26,7 @@ feature.openhab-config: \
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 47652c4bbb2..1dab572817a 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -19,7 +19,7 @@ Fragment-Host: org.openhab.core.io.net
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	org.hamcrest;version='[2.2.0,2.2.1)',\
-	org.osgi.service.component;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	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)',\
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 677a0bd0f33..1aeef1b6512 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -14,7 +14,7 @@ Fragment-Host: org.openhab.core.io.rest.core
 #
 -runbundles: \
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
-	org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+	org.osgi.service.jaxrs;version='[1.0.1,1.0.2)'\,
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
@@ -25,11 +25,11 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-	org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
+	org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -81,7 +81,7 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	json-path;version='[2.9.0,2.9.1)',\
 	net.minidev.accessors-smart;version='[2.5.0,2.5.1)',\
 	net.minidev.json-smart;version='[2.5.0,2.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 7950e7258ab..1b7dda47b1b 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -25,7 +25,7 @@ Fragment-Host: org.openhab.core.model.item
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
-	org.osgi.service.component;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
@@ -77,7 +77,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
@@ -88,7 +88,7 @@ Fragment-Host: org.openhab.core.model.item
 	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.168,4.8.169)',\
+	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\
 	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='[1.2.25,1.2.26)',\
@@ -128,4 +128,5 @@ Fragment-Host: org.openhab.core.model.item
 	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)'
+	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)',\
+	org.openhab.core.model.thing.runtime;version='[4.2.0,4.2.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index f53166f89f2..bdaabef1487 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -29,7 +29,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
@@ -81,7 +81,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
@@ -92,7 +92,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	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.168,4.8.169)',\
+	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
 	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
@@ -131,4 +131,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	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)'
+	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)',\	
+	org.openhab.core.model.thing.runtime;version='[4.2.0,4.2.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index 215e92a3465..d380482d880 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -29,7 +29,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -85,7 +85,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
@@ -96,7 +96,7 @@ Fragment-Host: org.openhab.core.model.script
 	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.168,4.8.169)',\
+	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
 	org.apache.log4j;version='[1.2.25,1.2.26)',\
 	org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\
@@ -135,4 +135,5 @@ Fragment-Host: org.openhab.core.model.script
 	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)'
+	de.focus_shift.jollyday-jackson;version='[0.27.0,0.27.1)',\
+	org.openhab.core.model.thing.runtime;version='[4.2.0,4.2.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index e2d4fee4111..f643f9c2d68 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -26,7 +26,7 @@ Fragment-Host: org.openhab.core.model.thing
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
-	org.osgi.service.component;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -86,7 +86,7 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.threeten.extra;version='[1.7.2,1.7.3)',\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.16.0,2.16.1)',\
@@ -97,7 +97,7 @@ Fragment-Host: org.openhab.core.model.thing
 	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.168,4.8.169)',\
+	io.github.classgraph.classgraph;version='[4.8.172,4.8.173)',\
 	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='[1.2.25,1.2.26)',\
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index 2b4f869cf45..e9d0850cd8f 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core.storage.json
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
@@ -52,7 +52,7 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.test;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index a81bc05f1e3..3e41096dff9 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -21,7 +21,7 @@ Fragment-Host: org.openhab.core
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
 	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 2dd6f9847f4..3a71673b928 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -25,7 +25,7 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
@@ -60,7 +60,7 @@ Fragment-Host: org.openhab.core.thing
 	org.openhab.core.thing;version='[4.2.0,4.2.1)',\
 	org.openhab.core.thing.tests;version='[4.2.0,4.2.1)',\
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 0358154ab8f..571055a2ead 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -25,7 +25,7 @@ Fragment-Host: org.openhab.core.voice
 	org.osgi.util.function;version='[1.2.0,1.2.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)',\
+	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
 	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
@@ -58,7 +58,7 @@ Fragment-Host: org.openhab.core.voice
 	org.openhab.core.transform;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice;version='[4.2.0,4.2.1)',\
 	org.openhab.core.voice.tests;version='[4.2.0,4.2.1)',\
-	org.osgi.service.component.annotations;version='[1.5.0,1.5.1)',\
+	org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
 	org.openhab.core.addon;version='[4.2.0,4.2.1)',\
 	com.sun.jna;version='[5.14.0,5.14.1)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
diff --git a/pom.xml b/pom.xml
index 5a3aefa58c6..9ae95d94ec2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,8 @@
     <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.35.0.M0</xtext.version>
+    <slf4j-for-model.version>2.0.12</slf4j-for-model.version>
+    <xtext.version>2.35.0.M1</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>
diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml
index d0c29fcbd6e..f7e63b760a8 100644
--- a/tools/upgradetool/pom.xml
+++ b/tools/upgradetool/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>