diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
index 6addffe64..1e8b72e76 100644
--- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
+++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -77,5 +77,4 @@ Fragment-Host: org.openhab.automation.groovyscripting
 	junit-platform-commons;version='[1.9.2,1.9.3)',\
 	junit-platform-engine;version='[1.9.2,1.9.3)',\
 	junit-platform-launcher;version='[1.9.2,1.9.3)',\
-	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	xstream;version='[1.4.20,1.4.21)'
diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index 12f3cbd43..c5d1057ce 100644
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -71,5 +71,4 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
 	junit-platform-commons;version='[1.9.2,1.9.3)',\
 	junit-platform-engine;version='[1.9.2,1.9.3)',\
 	junit-platform-launcher;version='[1.9.2,1.9.3)',\
-	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	xstream;version='[1.4.20,1.4.21)'
diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 000c68b3e..ce906543b 100644
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -54,4 +54,4 @@ Fragment-Host: org.openhab.binding.astro
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index d2a5a0406..b643b35d1 100644
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -80,4 +80,4 @@ Fragment-Host: org.openhab.binding.avmfritz
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index b12690320..587fb1af1 100644
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -72,4 +72,5 @@ Fragment-Host: org.openhab.binding.feed
 	junit-platform-commons;version='[1.9.2,1.9.3)',\
 	junit-platform-engine;version='[1.9.2,1.9.3)',\
 	junit-platform-launcher;version='[1.9.2,1.9.3)',\
-	xstream;version='[1.4.20,1.4.21)'
+	xstream;version='[1.4.20,1.4.21)',\
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 54bc468c2..21b327d53 100644
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -86,4 +86,4 @@ Fragment-Host: org.openhab.binding.hue
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 0a06ea113..02f6e9864 100644
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -66,4 +66,4 @@ Fragment-Host: org.openhab.binding.max
 	junit-platform-engine;version='[1.9.2,1.9.3)',\
 	junit-platform-launcher;version='[1.9.2,1.9.3)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index c42f3e8da..20148f6ab 100644
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -86,4 +86,4 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index b2f27e801..a55f2e191 100644
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -74,5 +74,4 @@ Fragment-Host: org.openhab.binding.modbus
 	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
-	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	xstream;version='[1.4.20,1.4.21)'
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 10f6abfdb..82e05021e 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -98,7 +98,6 @@ Import-Package: \
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	io.netty.buffer;version='[4.1.92,4.1.93)',\
 	io.netty.codec;version='[4.1.92,4.1.93)',\
 	io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
@@ -108,5 +107,4 @@ Import-Package: \
 	io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
 	io.netty.resolver;version='[4.1.92,4.1.93)',\
 	io.netty.transport;version='[4.1.92,4.1.93)',\
-	io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)',\
-	jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
+	io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index fdb054c15..cb2781f5c 100644
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -98,7 +98,6 @@ Import-Package: \
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	io.netty.buffer;version='[4.1.92,4.1.93)',\
 	io.netty.codec;version='[4.1.92,4.1.93)',\
 	io.netty.codec-mqtt;version='[4.1.92,4.1.93)',\
@@ -108,6 +107,5 @@ Import-Package: \
 	io.netty.handler-proxy;version='[4.1.92,4.1.93)',\
 	io.netty.resolver;version='[4.1.92,4.1.93)',\
 	io.netty.transport;version='[4.1.92,4.1.93)',\
-	io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)',\
-	jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
+	io.netty.transport-native-unix-common;version='[4.1.92,4.1.93)'
 
diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index d943fe38b..2e565f2a5 100644
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -110,4 +110,4 @@ Fragment-Host: org.openhab.binding.nest
 	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.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 46ee33f90..778ecbdba 100644
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -70,4 +70,4 @@ Fragment-Host: org.openhab.binding.ntp
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 2ecbb06ae..727b85b0a 100644
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -73,4 +73,4 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 2302fd9b8..c41296d1f 100644
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -77,4 +77,4 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 8904e2390..cece3bdf7 100644
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -82,4 +82,4 @@ Fragment-Host: org.openhab.binding.wemo
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.openhab.core.transform;version='[4.0.0,4.0.1)'
diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 17743b204..78704eef7 100644
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -64,5 +64,4 @@ Fragment-Host: org.openhab.persistence.mapdb
 	junit-platform-commons;version='[1.9.2,1.9.3)',\
 	junit-platform-engine;version='[1.9.2,1.9.3)',\
 	junit-platform-launcher;version='[1.9.2,1.9.3)',\
-	xstream;version='[1.4.20,1.4.21)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	xstream;version='[1.4.20,1.4.21)'