From 459064fe5b411623230d9ecd1c52fa13d54094a3 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sun, 7 Sep 2025 10:52:25 +0200
Subject: [PATCH] Upgrade hivemq-mqtt-client to 1.3.9 (#5005)

* Upgrade hivemq-mqtt-client from 1.3.7 to 1.3.9,
  changelog:
  https://github.com/hivemq/hivemq-mqtt-client/releases/tag/v1.3.8
  https://github.com/hivemq/hivemq-mqtt-client/releases/tag/v1.3.9
* Upgrade netty from 4.1.122 to 4.1.126,
  changelog:
  https://netty.io/news/2025/07/16/4-1-123-Final.html
  https://netty.io/news/2025/08/13/4-1-124-Final.html
  https://netty.io/news/2025/09/03/4-1-126-Final.html

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile/pom.xml                           |  2 +-
 bom/runtime/pom.xml                           |  4 +-
 .../openhab-tp/src/main/feature/feature.xml   | 38 +++++++++----------
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  2 +-
 .../itest.bndrun                              |  3 +-
 .../itest.bndrun                              |  3 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  1 +
 .../itest.bndrun                              |  3 +-
 .../itest.bndrun                              |  2 +-
 itests/org.openhab.core.tests/itest.bndrun    |  2 +-
 24 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index fe3c4a6cb..100eaa3f1 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -251,7 +251,7 @@
     <dependency>
       <groupId>com.hivemq</groupId>
       <artifactId>hivemq-mqtt-client</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.9</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 8d455ffe9..63b0de63a 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -527,13 +527,13 @@
     <dependency>
       <groupId>com.hivemq</groupId>
       <artifactId>hivemq-mqtt-client</artifactId>
-      <version>1.3.7</version>
+      <version>1.3.9</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.openhab.osgiify</groupId>
       <artifactId>com.google.dagger</artifactId>
-      <version>2.27</version>
+      <version>2.42</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 10ea70c30..7b1bc9d02 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -64,14 +64,14 @@
 	</feature>
 
 	<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
-		<capability>openhab.tp;feature=hivemqclient;version=1.3.7</capability>
+		<capability>openhab.tp;feature=hivemqclient;version=1.3.9</capability>
 		<feature dependency="true">openhab.tp-netty</feature>
 		<bundle dependency="true">mvn:org.jctools/jctools-core/2.1.2</bundle>
 		<bundle dependency="true">mvn:io.reactivex.rxjava2/rxjava/2.2.21</bundle>
 		<bundle dependency="true">mvn:org.reactivestreams/reactive-streams/1.0.4</bundle>
-		<bundle dependency="true">mvn:org.openhab.osgiify/com.google.dagger/2.27</bundle>
+		<bundle dependency="true">mvn:org.openhab.osgiify/com.google.dagger/2.42</bundle>
 		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
-		<bundle>mvn:com.hivemq/hivemq-mqtt-client/1.3.7</bundle>
+		<bundle>mvn:com.hivemq/hivemq-mqtt-client/1.3.9</bundle>
 	</feature>
 
 	<feature name="openhab.tp-httpclient" version="${project.version}">
@@ -143,22 +143,22 @@
 	</feature>
 
 	<feature name="openhab.tp-netty" description="Netty bundles" version="${project.version}">
-		<capability>openhab.tp;feature=netty;version=4.1.122.Final</capability>
-		<bundle dependency="true">mvn:io.netty/netty-buffer/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-common/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-codec/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-codec-http/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-codec-http2/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-codec-mqtt/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-codec-socks/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-handler/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-handler-proxy/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-resolver/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-transport/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-transport-native-kqueue/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-transport-native-unix-common/4.1.122.Final</bundle>
-		<bundle dependency="true">mvn:io.netty/netty-transport-classes-epoll/4.1.122.Final</bundle>
+		<capability>openhab.tp;feature=netty;version=4.1.126.Final</capability>
+		<bundle dependency="true">mvn:io.netty/netty-buffer/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-common/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec-http/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec-http2/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec-mqtt/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-codec-socks/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-handler/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-handler-proxy/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-resolver/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport-native-kqueue/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport-native-unix-common/4.1.126.Final</bundle>
+		<bundle dependency="true">mvn:io.netty/netty-transport-classes-epoll/4.1.126.Final</bundle>
 		<bundle dependency="true">mvn:io.netty/netty-tcnative-classes/2.0.70.Final</bundle>
 	</feature>
 
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index 595ac749a..f0869f481 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -76,5 +76,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.openhab.core.io.net;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index bd369f992..30a9b6904 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
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 aa1b49657..87538291d 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
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 5a8623810..be319ea35 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -70,7 +70,7 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
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 15c3b4377..2eeea0415 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index e32c09cba..c30b78888 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -73,7 +73,7 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index f874d10d5..41bfd5e2c 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -66,5 +66,5 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core.config.core.tests;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.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 8abfd5690..ebdc3887e 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -73,6 +73,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.openhab.core.thing;version='[5.1.0,5.1.1)',\
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 06cf6b51e..3f25ca6a0 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -72,6 +72,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.thing;version='[5.1.0,5.1.1)',\
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.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 3d02c23c7..f19b8da0b 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
@@ -74,5 +74,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.thing;version='[5.1.0,5.1.1)',\
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.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 f43dec796..41153ba77 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -81,6 +81,6 @@ Provide-Capability: \
 	org.openhab.core.thing;version='[5.1.0,5.1.1)',\
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 762757d8d..5ba2ee058 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -59,5 +59,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.config.dispatch.tests;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index a48edf650..faac763cd 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -68,7 +68,7 @@ feature.openhab-config: \
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
 	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 7574fd07c..a46fdaf2f 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -71,5 +71,5 @@ Fragment-Host: org.openhab.core.io.net
 	org.openhab.core.io.net.tests;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.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 9d3928e40..483a2000e 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -104,4 +104,5 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	stax2-api;version='[4.2.2,4.2.3)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'
+	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index f889aea29..c614fea33 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -110,6 +110,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.model.script.runtime;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\
+	org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\
 	org.openhab.core.persistence;version='[5.1.0,5.1.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
@@ -128,4 +129,4 @@ Fragment-Host: org.openhab.core.model.item
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
 	org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\
-	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'
+	org.osgi.service.cm;version='[1.6.1,1.6.2)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index c1de54300..65b5589db 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -113,6 +113,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.model.script.runtime;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\
+	org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\
 	org.openhab.core.persistence;version='[5.1.0,5.1.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
@@ -130,4 +131,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
-	org.yaml.snakeyaml;version='[2.4.0,2.4.1)'
+	org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index 5c64d6db9..a828d4281 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -117,6 +117,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.model.script.tests;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.sitemap;version='[5.1.0,5.1.1)',\
 	org.openhab.core.model.thing;version='[5.1.0,5.1.1)',\
+	org.openhab.core.model.thing.runtime;version='[5.1.0,5.1.1)',\
 	org.openhab.core.persistence;version='[5.1.0,5.1.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)',\
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 28be91fdf..42cc73596 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -136,4 +136,5 @@ Fragment-Host: org.openhab.core.model.thing
 	com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.19.2,2.19.3)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
-	org.yaml.snakeyaml;version='[2.4.0,2.4.1)'
+	org.yaml.snakeyaml;version='[2.4.0,2.4.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index c102c7617..bb975ba42 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -66,6 +66,6 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.thing;version='[5.1.0,5.1.1)',\
 	org.openhab.core.transform;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
 	org.openhab.core.semantics;version='[5.1.0,5.1.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index 5783c5077..e0deaa331 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -63,5 +63,5 @@ Fragment-Host: org.openhab.core
 	org.openhab.core.test;version='[5.1.0,5.1.1)',\
 	org.openhab.core.tests;version='[5.1.0,5.1.1)',\
 	biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'