From 318d0c2af895e2b4aeb185c19095128a4c260887 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sat, 25 Feb 2023 17:34:04 +0100
Subject: [PATCH] Update to bnd 7

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .github/workflows/ci-build.yml                |  5 +-
 .../org.openhab.core.addon.tests/itest.bndrun |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  5 +-
 .../itest.bndrun                              |  4 +-
 .../itest.bndrun                              |  3 +-
 .../itest.bndrun                              |  4 +-
 itests/org.openhab.core.tests/itest.bndrun    |  4 +-
 .../org.openhab.core.thing.tests/itest.bndrun |  4 +-
 .../org.openhab.core.voice.tests/itest.bndrun |  4 +-
 pom.xml                                       | 85 +++++++++++++------
 26 files changed, 112 insertions(+), 74 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 0489d115199..e573716aa89 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'bnd-7'
     paths-ignore:
       - '.github/**/*.md'
   pull_request:
@@ -11,6 +12,8 @@ on:
       - 'main'
     paths-ignore:
       - '.github/**/*.md'
+  schedule:
+    - cron: '0 3 * * *'
   workflow_dispatch:
 
 jobs:
@@ -69,7 +72,7 @@ jobs:
 
       - name: Build
         id: build
-        run: mvn clean verify -B -T 1.5C -U
+        run: mvn clean verify -B -DskipChecks=true -T 1.5C -U
         env:
           MAVEN_OPTS: >-
             -Xmx2g
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 45665c6365d..dffd63c8b0e 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.addon
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -61,4 +60,5 @@ Fragment-Host: org.openhab.core.addon
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index 509ec356590..b3df719f251 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -69,4 +68,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 842201341fd..a130ff5758b 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.automation
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 ce3c205dde4..92065430204 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.automation
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 261af8ee66e..58d7a45e6b6 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -64,4 +63,5 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 428caececf4..ac799ac552c 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.automation
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 1215cf2eccb..c89935663c6 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.automation
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 33513cc4ead..12cfd5a4f9e 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.config.core
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 ba9440afbbd..ea4d121670c 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
 	javax.jmdns;version='[3.5.8,3.5.9)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index d25a754a0d9..98922c02886 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 a2eb4d598b2..3d03b00ab78 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
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 3d7e861065d..4a7f5acaf44 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -36,7 +36,6 @@ Provide-Capability: \
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -75,4 +74,5 @@ Provide-Capability: \
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 09eb0be8f3d..e22f1819103 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index d8bd4c1bec0..7ac757fbdbd 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -33,7 +33,6 @@ feature.openhab-config: \
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -64,4 +63,5 @@ feature.openhab-config: \
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 8485cb15bf5..3918a83d3b4 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -10,7 +10,6 @@ Fragment-Host: org.openhab.core.io.net
 	bnd.identity;id='org.apache.aries.spifly.dynamic.bundle'
 
 -runbundles: \
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.core.io.net
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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 2671c447356..1f13b47c604 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	org.objectweb.asm;version='[9.4.0,9.4.1)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
@@ -104,4 +103,5 @@ Fragment-Host: org.openhab.core.io.rest.core
 	json-path;version='[2.8.0,2.8.1)',\
 	net.minidev.accessors-smart;version='[2.4.9,2.4.10)',\
 	net.minidev.json-smart;version='[2.4.10,2.4.11)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 8b5ee77cb83..a8cbc078dd5 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -38,7 +38,6 @@ Fragment-Host: org.openhab.core.model.item
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -114,4 +113,5 @@ Fragment-Host: org.openhab.core.model.item
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 1ded91e0de5..d7529fa33b1 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -42,7 +42,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -118,4 +117,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index b3f68a8e50d..3b96565ba40 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.model.script
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -122,4 +121,5 @@ Fragment-Host: org.openhab.core.model.script
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
 	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
-	org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)'
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.item.runtime;version='[4.1.0,4.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 b5df5c10058..0f14378a1f9 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.model.thing
 	com.google.inject;version='[5.0.1,5.0.2)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	io.github.classgraph;version='[4.8.149,4.8.150)',\
 	org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
@@ -124,4 +123,4 @@ Fragment-Host: org.openhab.core.model.thing
 	uom-lib-common;version='[2.2.0,2.2.1)',\
 	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
-	org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)'
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index a28cd2a895c..28ba1cc9977 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core.storage.json
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.storage.json
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index f7b6ad99c2c..5a159a61ec8 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.core
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -59,4 +58,5 @@ Fragment-Host: org.openhab.core
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index f20253fa907..6ac4a58cef1 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -68,4 +67,5 @@ Fragment-Host: org.openhab.core.thing
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index f8f7ecb0639..66552799fc0 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.voice
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
 	ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.gson;version='[2.9.1,2.9.2)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.core.voice
 	org.apiguardian.api;version='[1.1.2,1.1.3)',\
 	tech.units.indriya;version='[2.2.0,2.2.1)',\
 	uom-lib-common;version='[2.2.0,2.2.1)',\
-	io.methvin.directory-watcher;version='[0.18.0,0.18.1)'
+	io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/pom.xml b/pom.xml
index 48eedd4f2ad..e125772de02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
-    <bnd.version>6.4.0</bnd.version>
+    <bnd.version>7.0.0-RC1</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.3.0</eea.version>
     <karaf.compile.version>4.4.3</karaf.compile.version>
@@ -116,6 +116,46 @@
     </dependencies>
   </dependencyManagement>
 
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>bnd</id>
+      <name>Bnd release candidates</name>
+      <url>https://bndtools.jfrog.io/bndtools/update-rc</url>
+      <!--
+        <name>Bnd snapshots</name>
+        <url>https://bndtools.jfrog.io/bndtools/libs-snapshot-local</url>
+      -->
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+      <id>bnd</id>
+      <name>Bnd release candidates</name>
+      <url>https://bndtools.jfrog.io/bndtools/update-rc</url>
+      <!--
+        <name>Bnd snapshots</name>
+        <url>https://bndtools.jfrog.io/bndtools/libs-snapshot-local</url>
+      -->
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -205,7 +245,7 @@ Import-Package: \\
           <version>${bnd.version}</version>
           <configuration>
             <failOnChanges>false</failOnChanges>
-            <bndruns/>
+            <bndruns></bndruns>
           </configuration>
           <executions>
             <execution>
@@ -334,15 +374,11 @@ Import-Package: \\
             <!-- The search function is broken without the workaround below -->
             <!-- See: https://stackoverflow.com/questions/52326318/maven-javadoc-search-redirects-to-undefined-url -->
             <additionalJOption>--allow-script-in-comments</additionalJOption>
-            <bottom>
-              <![CDATA[
-                <script>
+            <bottom><![CDATA[<script>
                 if (typeof useModuleDirectories !== 'undefined') {
                   useModuleDirectories = false;
                 }
-                </script>
-              ]]>
-            </bottom>
+                </script>]]></bottom>
           </configuration>
           <dependencies>
             <!-- This newer version fixes issues with resolving tech.units:indriya packages -->
@@ -392,10 +428,8 @@ Import-Package: \\
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.1.2</version>
           <configuration>
-            <argLine>
-              --add-opens java.base/java.net=ALL-UNNAMED
-              --add-opens java.base/java.util=ALL-UNNAMED
-            </argLine>
+            <argLine>--add-opens java.base/java.net=ALL-UNNAMED
+              --add-opens java.base/java.util=ALL-UNNAMED</argLine>
             <systemPropertyVariables>
               <junit.jupiter.execution.timeout.default>15 m</junit.jupiter.execution.timeout.default>
             </systemPropertyVariables>
@@ -547,11 +581,11 @@ Import-Package: \\
                 <file>openhab_codestyle.xml</file>
                 <version>${spotless.eclipse.version}</version>
               </eclipse>
-              <removeUnusedImports/>
+              <removeUnusedImports></removeUnusedImports>
               <importOrder>
                 <file>openhab.importorder</file>
               </importOrder>
-              <endWithNewline/>
+              <endWithNewline></endWithNewline>
             </java>
             <formats>
               <format>
@@ -570,8 +604,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
               <format>
                 <!-- feature.xml -->
@@ -585,8 +619,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
               <format>
                 <!-- pom.xml -->
@@ -600,8 +634,8 @@ Import-Package: \\
                   </files>
                   <version>${spotless.eclipse.wtp.version}</version>
                 </eclipseWtp>
-                <trimTrailingWhitespace/>
-                <endWithNewline/>
+                <trimTrailingWhitespace></trimTrailingWhitespace>
+                <endWithNewline></endWithNewline>
               </format>
             </formats>
           </configuration>
@@ -711,7 +745,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -724,7 +758,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -738,7 +772,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                     <pluginExecution>
@@ -751,7 +785,7 @@ Import-Package: \\
                         </goals>
                       </pluginExecutionFilter>
                       <action>
-                        <ignore/>
+                        <ignore></ignore>
                       </action>
                     </pluginExecution>
                   </pluginExecutions>
@@ -831,4 +865,5 @@ Import-Package: \\
       </build>
     </profile>
   </profiles>
+
 </project>