From ec3f5369be1b0c2f7ef2c45e173233e4f77356af Mon Sep 17 00:00:00 2001
From: J-N-K <github@klug.nrw>
Date: Sat, 25 Feb 2023 12:37:37 +0100
Subject: [PATCH] Resolve itests after core changes (#14498)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 .../itest.bndrun                                            | 3 ++-
 itests/org.openhab.binding.astro.tests/itest.bndrun         | 3 ++-
 itests/org.openhab.binding.avmfritz.tests/itest.bndrun      | 3 ++-
 .../internal/handler/AVMFritzThingHandlerOSGiTest.java      | 6 +++++-
 itests/org.openhab.binding.feed.tests/itest.bndrun          | 3 ---
 itests/org.openhab.binding.hue.tests/itest.bndrun           | 3 ---
 itests/org.openhab.binding.max.tests/itest.bndrun           | 5 +----
 itests/org.openhab.binding.mielecloud.tests/itest.bndrun    | 5 +----
 itests/org.openhab.binding.modbus.tests/itest.bndrun        | 5 +----
 .../itest.bndrun                                            | 5 +----
 itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun    | 5 +----
 itests/org.openhab.binding.nest.tests/itest.bndrun          | 5 +----
 itests/org.openhab.binding.ntp.tests/itest.bndrun           | 5 +----
 itests/org.openhab.binding.systeminfo.tests/itest.bndrun    | 5 +----
 itests/org.openhab.binding.tradfri.tests/itest.bndrun       | 5 +----
 itests/org.openhab.binding.wemo.tests/itest.bndrun          | 5 +----
 itests/org.openhab.persistence.mapdb.tests/itest.bndrun     | 3 ++-
 17 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
index b2a9e884ec5..183caa6ebf2 100644
--- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
+++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -70,4 +70,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	xstream;version='[1.4.19,1.4.20)'
diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index df7005041dc..601ecb572e3 100644
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -52,4 +52,5 @@ Fragment-Host: org.openhab.binding.astro
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-	com.sun.jna;version='[5.12.1,5.12.2)'
+	com.sun.jna;version='[5.12.1,5.12.2)',\
+	xstream;version='[1.4.19,1.4.20)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index c924f527b30..aabce86185d 100644
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -79,4 +79,5 @@ Fragment-Host: org.openhab.binding.avmfritz
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-	com.sun.jna;version='[5.12.1,5.12.2)'
+	com.sun.jna;version='[5.12.1,5.12.2)',\
+	xstream;version='[1.4.19,1.4.20)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzThingHandlerOSGiTest.java b/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzThingHandlerOSGiTest.java
index f9b05783121..6c59d5cd183 100644
--- a/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzThingHandlerOSGiTest.java
+++ b/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzThingHandlerOSGiTest.java
@@ -31,6 +31,7 @@ import org.openhab.core.test.storage.VolatileStorageService;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ManagedThingProvider;
 import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.openhab.core.thing.binding.builder.BridgeBuilder;
 
@@ -74,7 +75,10 @@ public abstract class AVMFritzThingHandlerOSGiTest extends JavaOSGiTest {
 
         bridgeHandler.setCallback(callback);
 
-        assertNull(bridge.getHandler());
+        ThingHandler oldHandler = bridge.getHandler();
+        if (oldHandler != null) {
+            oldHandler.dispose();
+        }
         bridge.setHandler(bridgeHandler);
         assertNotNull(bridge.getHandler());
 
diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 37640825c04..8785a38ddc1 100644
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -5,7 +5,6 @@ Fragment-Host: org.openhab.binding.feed
 
 -runrequires: \
 	bnd.identity;id='org.openhab.binding.feed.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml',\
 	bnd.identity;id='org.apache.felix.configadmin',\
 	osgi.identity;filter:='(&(osgi.identity=org.ops4j.pax.web.pax-web-runtime)(version>=7.2.3))'
 
@@ -69,11 +68,9 @@ Fragment-Host: org.openhab.binding.feed
 	org.openhab.binding.feed.tests;version='[4.0.0,4.0.1)',\
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index b5b69dca36a..9ec1f5e6f2d 100644
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -5,7 +5,6 @@ Fragment-Host: org.openhab.binding.hue
 
 -runrequires: \
 	bnd.identity;id='org.openhab.binding.hue.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml',\
 	bnd.identity;id='org.eclipse.jdt.annotation'
 
 # We would like to use the "volatile" storage only
@@ -72,13 +71,11 @@ Fragment-Host: org.openhab.binding.hue
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery.mdns;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)'
diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 50fc6538b01..a17236911a8 100644
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.max
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.max.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.max.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -61,11 +60,9 @@ Fragment-Host: org.openhab.binding.max
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)'
diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index d999752ec46..40a1f34aa59 100644
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.mielecloud
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.mielecloud.tests',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+    bnd.identity;id='org.openhab.binding.mielecloud.tests'
 
 -runblacklist: \
     bnd.identity;id='org.openhab.core.storage.json',\
@@ -78,12 +77,10 @@ Fragment-Host: org.openhab.binding.mielecloud
 	org.openhab.core.auth.oauth2client;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 3944e44a27c..65a16f3888f 100644
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.modbus
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.modbus.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.modbus.tests',
 
 # 1) We would like to use the "volatile" storage only, drop other storage
 -runblacklist: \
@@ -68,12 +67,10 @@ Fragment-Host: org.openhab.binding.modbus
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.modbus;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index 3d0ef56a8f6..652e63f59a4 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -12,8 +12,7 @@ Import-Package: \
 	moquette-broker-[0-9.]*.jar;lib:=true
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.mqtt.homeassistant.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.mqtt.homeassistant.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -102,12 +101,10 @@ Import-Package: \
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.mqtt;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index 9ab9537a2cd..3efd4939c1f 100644
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -12,8 +12,7 @@ Import-Package: \
         moquette-broker-[0-9.]*.jar;lib:=true
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.mqtt.homie.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.mqtt.homie.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -102,12 +101,10 @@ Import-Package: \
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.mqtt;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.transform;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index a27e30fc090..788d18243ab 100644
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.nest
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.nest.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.nest.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -97,12 +96,10 @@ Fragment-Host: org.openhab.binding.nest
 	org.openhab.core.auth.oauth2client;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 6744333b881..6b149864aa1 100644
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.ntp
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.ntp.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.ntp.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -65,11 +64,9 @@ Fragment-Host: org.openhab.binding.ntp
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)'
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 094c6b2ab91..45fa5ac5952 100644
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.systeminfo
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.systeminfo.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.systeminfo.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -69,10 +68,8 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.openhab.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)'
diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 10dd93ad5a1..a5722a914d4 100644
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.tradfri
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.tradfri.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.tradfri.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -71,12 +70,10 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery.mdns;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)'
diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 78c81f0c1f0..9398a5dbe2c 100644
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.wemo
 
 -runrequires: \
-	bnd.identity;id='org.openhab.binding.wemo.tests',\
-	bnd.identity;id='org.openhab.core.thing.xml'
+	bnd.identity;id='org.openhab.binding.wemo.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -75,13 +74,11 @@ Fragment-Host: org.openhab.binding.wemo
 	org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
 	org.openhab.core.config.discovery.upnp;version='[4.0.0,4.0.1)',\
-	org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
 	org.openhab.core.io.transport.upnp;version='[4.0.0,4.0.1)',\
 	org.openhab.core.test;version='[4.0.0,4.0.1)',\
 	org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-	org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 84cd06581d4..5ac749cc0fb 100644
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -63,4 +63,5 @@ Fragment-Host: org.openhab.persistence.mapdb
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	xstream;version='[1.4.19,1.4.20)'