From e64c06c22bbb0415232244ef4fb8c55e183559b6 Mon Sep 17 00:00:00 2001
From: J-N-K <github@klug.nrw>
Date: Sat, 12 Mar 2022 21:05:37 +0100
Subject: [PATCH] Upgrade build tools and allow building on macOS 12 / M1
 (#2836)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---
 bom/compile/pom.xml                                       | 2 +-
 .../org.openhab.core.auth.oauth2client.tests/itest.bndrun | 4 ++--
 .../itest.bndrun                                          | 4 ++--
 .../itest.bndrun                                          | 5 ++---
 .../automation/internal/module/RunRuleModuleTest.java     | 4 ++--
 .../core/automation/internal/module/RuntimeRuleTest.java  | 4 ++--
 .../itest.bndrun                                          | 4 ++--
 .../itest.bndrun                                          | 5 ++---
 .../module/timer/internal/BasicConditionHandlerTest.java  | 6 +++---
 .../automation/module/timer/internal/RuntimeRuleTest.java | 4 ++--
 itests/org.openhab.core.automation.tests/itest.bndrun     | 5 ++---
 .../org/openhab/core/automation/event/RuleEventTest.java  | 4 ++--
 itests/org.openhab.core.binding.xml.tests/itest.bndrun    | 5 ++---
 .../openhab/core/binding/xml/test/BindingInfoTest.java    | 4 ++--
 itests/org.openhab.core.config.core.tests/itest.bndrun    | 4 ++--
 .../itest.bndrun                                          | 4 ++--
 .../org.openhab.core.config.discovery.tests/itest.bndrun  | 4 ++--
 .../itest.bndrun                                          | 4 ++--
 .../itest.bndrun                                          | 4 ++--
 .../org.openhab.core.config.dispatch.tests/itest.bndrun   | 4 ++--
 itests/org.openhab.core.config.xml.tests/itest.bndrun     | 4 ++--
 itests/org.openhab.core.ephemeris.tests/itest.bndrun      | 4 ++--
 itests/org.openhab.core.io.rest.core.tests/itest.bndrun   | 7 +++++--
 itests/org.openhab.core.model.core.tests/itest.bndrun     | 6 +++---
 itests/org.openhab.core.model.item.tests/itest.bndrun     | 5 +++--
 itests/org.openhab.core.model.rule.tests/itest.bndrun     | 4 ++--
 itests/org.openhab.core.model.script.tests/itest.bndrun   | 5 +++--
 itests/org.openhab.core.model.thing.tests/itest.bndrun    | 4 ++--
 itests/org.openhab.core.storage.json.tests/itest.bndrun   | 4 ++--
 itests/org.openhab.core.tests/itest.bndrun                | 4 ++--
 itests/org.openhab.core.thing.tests/itest.bndrun          | 4 ++--
 itests/org.openhab.core.thing.xml.tests/itest.bndrun      | 4 ++--
 itests/org.openhab.core.voice.tests/itest.bndrun          | 4 ++--
 pom.xml                                                   | 8 ++++----
 34 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 891c96c1bb..fd9bc71f95 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>org.eclipse.jdt.annotation</artifactId>
-      <version>2.2.100</version>
+      <version>2.2.600</version>
       <!--<scope>compile</scope> -->
     </dependency>
 
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index 5ec0ce7646..745f556533 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -49,7 +49,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.openhab.core.io.net;version='[3.3.0,3.3.1)',\
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index c925ebbca0..e2b3a0727a 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.automation
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 53d38d7832..83102893c9 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -42,7 +41,6 @@ Fragment-Host: org.openhab.core.automation
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -55,4 +53,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
index 4593d2f508..3bb3673949 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RunRuleModuleTest.java
@@ -13,7 +13,6 @@
 package org.openhab.core.automation.internal.module;
 
 import static java.util.Map.entry;
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.ArrayList;
@@ -21,6 +20,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.Set;
 
@@ -88,7 +88,7 @@ public class RunRuleModuleTest extends JavaOSGiTest {
         registerService(volatileStorageService);
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
     }
diff --git a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
index deacd0db75..d0aede698f 100644
--- a/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.core.tests/src/main/java/org/openhab/core/automation/internal/module/RuntimeRuleTest.java
@@ -13,7 +13,6 @@
 package org.openhab.core.automation.internal.module;
 
 import static java.util.Map.entry;
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Collection;
@@ -21,6 +20,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.Random;
 import java.util.Set;
@@ -101,7 +101,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         registerService(volatileStorageService);
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
     }
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 02137bbc9d..e93837c43a 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -55,4 +54,5 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 72bd7a1eaf..a671efaa52 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -42,7 +41,6 @@ Fragment-Host: org.openhab.core.automation
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -55,4 +53,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
index c9b3891488..8875d304a8 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/BasicConditionHandlerTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.module.timer.internal;
 
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -22,6 +21,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
@@ -111,7 +111,7 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
         }, 3000, 100);
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
     }
@@ -142,7 +142,7 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
         EventPublisher eventPublisher = getService(EventPublisher.class);
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
 
diff --git a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
index d56bfbfd94..15a63d282c 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
+++ b/itests/org.openhab.core.automation.module.timer.tests/src/main/java/org/openhab/core/automation/module/timer/internal/RuntimeRuleTest.java
@@ -12,7 +12,6 @@
  */
 package org.openhab.core.automation.module.timer.internal;
 
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -22,6 +21,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
@@ -87,7 +87,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
         }, 3000, 100);
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
     }
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 6dc2647dfa..78b909be0e 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.automation
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
-	org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
@@ -42,7 +41,6 @@ Fragment-Host: org.openhab.core.automation
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -55,4 +53,5 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
index 155bfed989..a7beacdb5f 100644
--- a/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
+++ b/itests/org.openhab.core.automation.tests/src/main/java/org/openhab/core/automation/event/RuleEventTest.java
@@ -13,7 +13,6 @@
 package org.openhab.core.automation.event;
 
 import static java.util.Map.entry;
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
@@ -22,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -102,7 +102,7 @@ public class RuleEventTest extends JavaOSGiTest {
         registerVolatileStorageService();
 
         // start rule engine
-        RuleEngineImpl ruleEngine = requireNonNull((RuleEngineImpl) getService(RuleManager.class));
+        RuleEngineImpl ruleEngine = Objects.requireNonNull((RuleEngineImpl) getService(RuleManager.class));
         ruleEngine.onReadyMarkerAdded(new ReadyMarker("", ""));
         waitForAssert(() -> assertTrue(ruleEngine.isStarted()));
     }
diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
index 94f78184c9..f4b8335076 100644
--- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun
@@ -19,7 +19,6 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.hamcrest;version='[2.2.0,2.2.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
-	org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	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)',\
@@ -45,7 +44,6 @@ Fragment-Host: org.openhab.core.binding.xml
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -57,4 +55,5 @@ Fragment-Host: org.openhab.core.binding.xml
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
index 7bc3b573c2..578d3fe4d7 100644
--- a/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
+++ b/itests/org.openhab.core.binding.xml.tests/src/main/java/org/openhab/core/binding/xml/test/BindingInfoTest.java
@@ -12,12 +12,12 @@
  */
 package org.openhab.core.binding.xml.test;
 
-import static org.eclipse.jdt.annotation.Checks.requireNonNull;
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -88,7 +88,7 @@ public class BindingInfoTest extends JavaOSGiTest {
             Set<BindingInfo> bindingInfos = bindingInfoRegistry.getBindingInfos();
             BindingInfo bindingInfo = bindingInfos.iterator().next();
 
-            URI configDescriptionURI = requireNonNull(bindingInfo.getConfigDescriptionURI());
+            URI configDescriptionURI = Objects.requireNonNull(bindingInfo.getConfigDescriptionURI());
             ConfigDescription configDescription = configDescriptionRegistry.getConfigDescription(configDescriptionURI);
             List<ConfigDescriptionParameter> parameters = configDescription.getParameters();
             assertThat(parameters.size(), is(2));
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 6bdfc1492f..2d05e73c4b 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -44,7 +44,6 @@ Fragment-Host: org.openhab.core.config.core
 	net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 57989ab54e..7845a1fd26 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -42,7 +42,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 17e50aa58a..b200d63717 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -48,7 +48,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -63,4 +62,5 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 585af1441b..247188bce8 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
@@ -46,7 +46,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -60,4 +59,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 78195c8a28..17d71410d3 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -55,7 +55,6 @@ Provide-Capability: \
 	net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -68,4 +67,5 @@ Provide-Capability: \
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.thing;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 6b0692b4eb..64e015f614 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.config.dispatch
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -50,4 +49,5 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.config.dispatch.tests;version='[3.3.0,3.3.1)',\
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun
index 51fed3f193..e35913f82e 100644
--- a/itests/org.openhab.core.config.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.config.xml
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -50,4 +49,5 @@ Fragment-Host: org.openhab.core.config.xml
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index f963434e65..7a087ea12f 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -47,7 +47,6 @@ feature.openhab-config: \
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -59,4 +58,5 @@ feature.openhab-config: \
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.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 399388e458..73f646469c 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -6,6 +6,9 @@ Fragment-Host: org.openhab.core.io.rest.core
 -runrequires: \
 	bnd.identity;id='org.openhab.core.io.rest.core.tests'
 
+-runblacklist: \
+    bnd.identity;id='jakarta.ws.rs-api'
+    
 #
 # done
 #
@@ -71,7 +74,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
@@ -94,4 +96,5 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	com.google.gson;version='[2.8.9,2.8.10)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)'
+	org.objectweb.asm;version='[9.2.0,9.2.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun
index 942827f4a5..7938a08d3d 100644
--- a/itests/org.openhab.core.model.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.core.tests/itest.bndrun
@@ -53,7 +53,6 @@ Fragment-Host: org.openhab.core.model.core
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -93,7 +92,6 @@ Fragment-Host: org.openhab.core.model.core
 	org.openhab.core.io.http;version='[3.3.0,3.3.1)',\
 	org.openhab.core.io.net;version='[3.3.0,3.3.1)',\
 	org.openhab.core.model.item;version='[3.3.0,3.3.1)',\
-	org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)',\
 	org.openhab.core.model.persistence;version='[3.3.0,3.3.1)',\
 	org.openhab.core.model.rule;version='[3.3.0,3.3.1)',\
 	org.openhab.core.model.script;version='[3.3.0,3.3.1)',\
@@ -108,4 +106,6 @@ Fragment-Host: org.openhab.core.model.core
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\
-	org.threeten.extra;version='[1.5.0,1.5.1)'
+	org.threeten.extra;version='[1.5.0,1.5.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.3.0,3.3.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index b920e62c72..69e3f7e379 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -59,7 +59,6 @@ Fragment-Host: org.openhab.core.model.item
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
@@ -105,4 +104,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)'
+	org.objectweb.asm;version='[9.2.0,9.2.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.3.0,3.3.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index f990593c07..ef5c1abe9f 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -60,7 +60,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
@@ -107,5 +106,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
 	org.objectweb.asm;version='[9.2.0,9.2.1)',\
-	org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)'
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.3.0,3.3.1)'
 -runblacklist: bnd.identity;id='jakarta.activation-api'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index cec44d2d03..49cfa27ae0 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -62,7 +62,6 @@ Fragment-Host: org.openhab.core.model.script
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
@@ -107,4 +106,6 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)'
+	org.objectweb.asm;version='[9.2.0,9.2.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\
+	org.openhab.core.model.thing.runtime;version='[3.3.0,3.3.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 47bf4083f9..688816bfa4 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -67,7 +67,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
@@ -118,4 +117,5 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
 	org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)'
+	org.objectweb.asm;version='[9.2.0,9.2.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index ae2c60e8ad..15d46bf0eb 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.storage.json
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -49,4 +48,5 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.storage.json.tests;version='[3.3.0,3.3.1)',\
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index d2234b7f6c..b894746781 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -44,7 +44,6 @@ Fragment-Host: org.openhab.core
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core
 	org.openhab.core.test;version='[3.3.0,3.3.1)',\
 	org.openhab.core.tests;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 669cf1622e..5ab8d6be5d 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -51,7 +51,6 @@ Fragment-Host: org.openhab.core.thing
 	org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
 	org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
 	org.objenesis;version='[3.2.0,3.2.1)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -65,4 +64,5 @@ Fragment-Host: org.openhab.core.thing
 	org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
index 91eec3f7e9..2b695819e6 100644
--- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.thing.xml
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.thing.xml
 	org.openhab.core.thing.xml.tests;version='[3.3.0,3.3.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	xstream;version='[1.4.19,1.4.20)',\
-	com.google.gson;version='[2.8.9,2.8.10)'
+	com.google.gson;version='[2.8.9,2.8.10)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index ef1343dd1a..1af5bdc421 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -48,7 +48,6 @@ Fragment-Host: org.openhab.core.voice
 	junit-platform-commons;version='[1.8.1,1.8.2)',\
 	junit-platform-engine;version='[1.8.1,1.8.2)',\
 	junit-platform-launcher;version='[1.8.1,1.8.2)',\
-	biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
 	org.apache.felix.scr;version='[2.1.30,2.1.31)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
 	org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
@@ -69,4 +68,5 @@ Fragment-Host: org.openhab.core.voice
 	org.apache.xbean.finder;version='[4.20.0,4.20.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\
 	com.google.gson;version='[2.8.9,2.8.10)',\
-	org.objectweb.asm;version='[9.2.0,9.2.1)'
+	org.objectweb.asm;version='[9.2.0,9.2.1)',\
+	biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)'
diff --git a/pom.xml b/pom.xml
index 7ea2cb4885..c932a55946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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.1.0</bnd.version>
+    <bnd.version>6.2.0</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.3.0</eea.version>
     <karaf.compile.version>4.3.0</karaf.compile.version>
@@ -274,7 +274,7 @@ Import-Package: \\
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.10.1</version>
           <configuration>
             <compilerId>eclipse</compilerId>
             <compilerArguments>
@@ -292,12 +292,12 @@ Import-Package: \\
             <dependency>
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-compiler-eclipse</artifactId>
-              <version>2.8.8</version>
+              <version>2.11.1</version>
             </dependency>
             <dependency>
               <groupId>org.eclipse.jdt</groupId>
               <artifactId>ecj</artifactId>
-              <version>3.23.0</version>
+              <version>3.28.0</version>
             </dependency>
           </dependencies>
         </plugin>