From a933ebc709dc308afbf392be96f34c07cb5519a8 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sat, 1 Feb 2025 23:30:25 +0100
Subject: [PATCH 1/5] Upgrade swagger to 2.2.28

* Upgrade swagger from 2.2.15 to 2.2.28
For changelog, see https://github.com/swagger-api/swagger-core/releases
* Upgrade javassist from 3.29.2-GA to 3.30.2-GA

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile/pom.xml                                |  2 +-
 bom/runtime/pom.xml                                |  4 ++--
 .../karaf/openhab-tp/src/main/feature/feature.xml  | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 5d33b1a8e86..718454336d5 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -20,7 +20,7 @@
     <californium.version>2.7.4</californium.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <pax.web.version>8.0.30</pax.web.version>
-    <swagger.version>2.2.15</swagger.version>
+    <swagger.version>2.2.28</swagger.version>
   </properties>
 
   <dependencies>
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index cedf866213d..3d4d2bde77e 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -22,7 +22,7 @@
     <jetty.version>9.4.57.v20241219</jetty.version>
     <pax.logging.version>2.2.8</pax.logging.version>
     <pax.web.version>8.0.30</pax.web.version>
-    <swagger.version>2.2.15</swagger.version>
+    <swagger.version>2.2.28</swagger.version>
   </properties>
 
   <dependencyManagement>
@@ -1058,7 +1058,7 @@
     <dependency>
       <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.29.2-GA</version>
+      <version>3.30.2-GA</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 113b9339b81..04b5b3ed25e 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -270,16 +270,16 @@
 	</feature>
 
 	<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">
-		<capability>openhab.tp;feature=swagger-jaxrs;version=2.2.15</capability>
+		<capability>openhab.tp;feature=swagger-jaxrs;version=2.2.28</capability>
 		<feature dependency="true">openhab.tp-jax-rs-whiteboard</feature>
 		<feature dependency="true">openhab.tp-jackson</feature>
-		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-annotations/2.2.15</bundle>
-		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-core/2.2.15</bundle>
-		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-integration/2.2.15</bundle>
-		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/2.2.15</bundle>
-		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-models/2.2.15</bundle>
+		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-annotations/2.2.28</bundle>
+		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-core/2.2.28</bundle>
+		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-integration/2.2.28</bundle>
+		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/2.2.28</bundle>
+		<bundle dependency="true">mvn:io.swagger.core.v3/swagger-models/2.2.28</bundle>
 		<bundle dependency="true">mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
-		<bundle dependency="true">mvn:org.javassist/javassist/3.29.2-GA</bundle>
+		<bundle dependency="true">mvn:org.javassist/javassist/3.30.2-GA</bundle>
 	</feature>
 
 </features>

From 7125883885785fd7e9589046808de5591aa41bdb Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sun, 2 Feb 2025 07:49:57 +0100
Subject: [PATCH 2/5] Upgrade cxf to 3.6.5

* Upgrade cxf from 3.6.4 to 3.6.5

Find the list of relevant changes here:
https://github.com/apache/cxf/blame/3.6.x-fixes/distribution/src/main/release/release_notes.txt

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/runtime/pom.xml                                |  3 ++-
 bom/test/pom.xml                                   |  3 ++-
 .../karaf/openhab-tp/src/main/feature/feature.xml  | 14 +++++++-------
 .../itest.bndrun                                   | 12 ++++++------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 3d4d2bde77e..4e14cccc7f9 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -17,7 +17,8 @@
 
   <properties>
     <californium.version>2.7.4</californium.version>
-    <cxf.version>3.6.4</cxf.version>
+    <!-- cxf can be updated independently of karaf, only used in karaf tests -->
+    <cxf.version>3.6.5</cxf.version>
     <jackson.version>2.18.2</jackson.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <pax.logging.version>2.2.8</pax.logging.version>
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index 058da517772..655395eb98e 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -16,7 +16,8 @@
   <name>openHAB Core :: BOM :: Test</name>
 
   <properties>
-    <cxf.version>3.6.4</cxf.version>
+    <!-- cxf can be updated independently, karaf only uses it in tests -->
+    <cxf.version>3.6.5</cxf.version>
     <junit.version>5.10.0</junit.version>
     <mockito.version>4.11.0</mockito.version>
   </properties>
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 04b5b3ed25e..ddb074c7e36 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -115,7 +115,7 @@
 	</feature>
 
 	<feature name="openhab.tp-cxf" description="Apache CXF" version="${project.version}">
-		<capability>openhab.tp;feature=cxf;version=3.6.4</capability>
+		<capability>openhab.tp;feature=cxf;version=3.6.5</capability>
 		<feature dependency="true">openhab.tp-jaxws</feature>
 		<bundle dependency="true">mvn:com.fasterxml.woodstox/woodstox-core/6.6.2</bundle>
 		<bundle dependency="true">mvn:jakarta.jws/jakarta.jws-api/2.1.0</bundle>
@@ -124,12 +124,12 @@
 		<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.4</bundle>
 		<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/2.3.1</bundle>
 		<bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-core/3.6.4</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.4</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.4</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.4</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.4</bundle>
-		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.4</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-core/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-client/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-rs-sse/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-security/3.6.5</bundle>
+		<bundle>mvn:org.apache.cxf/cxf-rt-transports-http/3.6.5</bundle>
 	</feature>
 
 	<feature name="openhab.tp-jbbp" description="Java Binary Block Parser library" version="${project.version}">
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 358d7e9f692..34c5bb2e4a0 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -47,12 +47,12 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	org.apache.cxf.cxf-core;version='[3.6.4,3.6.5)',\
-	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.4,3.6.5)',\
-	org.apache.cxf.cxf-rt-rs-client;version='[3.6.4,3.6.5)',\
-	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.4,3.6.5)',\
-	org.apache.cxf.cxf-rt-security;version='[3.6.4,3.6.5)',\
-	org.apache.cxf.cxf-rt-transports-http;version='[3.6.4,3.6.5)',\
+	org.apache.cxf.cxf-core;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-rt-rs-client;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-rt-rs-sse;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-rt-security;version='[3.6.5,3.6.6)',\
+	org.apache.cxf.cxf-rt-transports-http;version='[3.6.5,3.6.6)',\
 	org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
 	junit-jupiter-api;version='[5.10.0,5.10.1)',\
 	junit-jupiter-engine;version='[5.10.0,5.10.1)',\

From c6b1d6ffe063f6398af3373bd77e42698b5fd42c Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sun, 2 Feb 2025 07:56:05 +0100
Subject: [PATCH 3/5] Upgrade junit to 5.11.4

* Upgrade junit from 5.10.0 to 5.11.4
* Upgrade junit-platform-* from 1.10.0 to 1.11.4

Release notes: https://junit.org/junit5/docs/5.11.4/release-notes/

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/test-index/pom.xml                               |  9 +++++++--
 bom/test/pom.xml                                     |  2 +-
 itests/org.openhab.core.addon.tests/itest.bndrun     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../org.openhab.core.automation.tests/itest.bndrun   | 10 +++++-----
 .../org.openhab.core.config.core.tests/itest.bndrun  | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 .../itest.bndrun                                     | 10 +++++-----
 itests/org.openhab.core.ephemeris.tests/itest.bndrun | 10 +++++-----
 itests/org.openhab.core.io.net.tests/itest.bndrun    | 10 +++++-----
 .../org.openhab.core.io.rest.core.tests/itest.bndrun | 12 ++++++------
 .../org.openhab.core.model.item.tests/itest.bndrun   | 10 +++++-----
 .../org.openhab.core.model.rule.tests/itest.bndrun   | 10 +++++-----
 .../org.openhab.core.model.script.tests/itest.bndrun | 10 +++++-----
 .../org.openhab.core.model.thing.tests/itest.bndrun  | 12 ++++++------
 .../org.openhab.core.storage.json.tests/itest.bndrun | 10 +++++-----
 itests/org.openhab.core.tests/itest.bndrun           | 10 +++++-----
 itests/org.openhab.core.thing.tests/itest.bndrun     | 10 +++++-----
 itests/org.openhab.core.voice.tests/itest.bndrun     | 12 ++++++------
 26 files changed, 131 insertions(+), 126 deletions(-)

diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml
index 1d7a49e28b5..0881528001c 100644
--- a/bom/test-index/pom.xml
+++ b/bom/test-index/pom.xml
@@ -19,12 +19,17 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.10.0</version>
+      <version>5.11.4</version>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.10.0</version>
+      <version>1.11.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+      <version>1.11.4</version>
     </dependency>
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index 655395eb98e..c05d5e65f57 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -18,7 +18,7 @@
   <properties>
     <!-- cxf can be updated independently, karaf only uses it in tests -->
     <cxf.version>3.6.5</cxf.version>
-    <junit.version>5.10.0</junit.version>
+    <junit.version>5.11.4</junit.version>
     <mockito.version>4.11.0</mockito.version>
   </properties>
 
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 62136483c1a..4ac038c9b66 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.addon
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index cbfee34be22..943baf368d3 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -37,11 +37,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 4f88433762a..8c1a985d0a6 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 14c01bff99d..2314bdb6eb0 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 546b9e431cd..5573a6dff94 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -34,11 +34,11 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 ad94d4f4831..4a675196c18 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 7ecaedeab9c..7a65008669b 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core.automation
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index b3c02537fc7..47851f7c219 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -40,11 +40,11 @@ Fragment-Host: org.openhab.core.config.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 7b9da2d23f0..38c0a9c8ff5 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index f8b62ecf9dd..7f737b15d11 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -40,11 +40,11 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 81e01f82c7d..b09f6ecd85b 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
@@ -39,11 +39,11 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 e60e5bb64e8..38d2885f439 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -48,11 +48,11 @@ Provide-Capability: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 558292e5133..371bfec8366 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -33,11 +33,11 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index eb632ccb5c9..20461dfc6df 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -39,11 +39,11 @@ feature.openhab-config: \
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 936c146c399..6c6eddd1630 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -34,11 +34,11 @@ Fragment-Host: org.openhab.core.io.net
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
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 34c5bb2e4a0..006a8887dd4 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -54,12 +54,12 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.cxf.cxf-rt-security;version='[3.6.5,3.6.6)',\
 	org.apache.cxf.cxf-rt-transports-http;version='[3.6.5,3.6.6)',\
 	org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-jupiter-params;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-jupiter-params;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 2b7a4ce10fb..3d05cbfbd68 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -42,11 +42,11 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
 	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
 	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 49c5bcb3f18..605107213a6 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -46,11 +46,11 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
 	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
 	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index d53d9f195b5..f1ab948d0d5 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -51,11 +51,11 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
 	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
 	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 253119d7018..f370dbf8f05 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -48,12 +48,12 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
 	org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
 	org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-jupiter-params;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-jupiter-params;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index 2e595360278..ee024efb11d 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -34,11 +34,11 @@ Fragment-Host: org.openhab.core.storage.json
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index 53df34c0394..cd0003145aa 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -38,11 +38,11 @@ Fragment-Host: org.openhab.core
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index be46a75a49e..199b8784f50 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -43,11 +43,11 @@ Fragment-Host: org.openhab.core.thing
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index f97b9f385de..2cf65a9feaa 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -38,12 +38,12 @@ Fragment-Host: org.openhab.core.voice
 	org.osgi.service.event;version='[1.4.1,1.4.2)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	junit-jupiter-api;version='[5.10.0,5.10.1)',\
-	junit-jupiter-engine;version='[5.10.0,5.10.1)',\
-	junit-jupiter-params;version='[5.10.0,5.10.1)',\
-	junit-platform-commons;version='[1.10.0,1.10.1)',\
-	junit-platform-engine;version='[1.10.0,1.10.1)',\
-	junit-platform-launcher;version='[1.10.0,1.10.1)',\
+	junit-jupiter-api;version='[5.11.4,5.11.5)',\
+	junit-jupiter-engine;version='[5.11.4,5.11.5)',\
+	junit-jupiter-params;version='[5.11.4,5.11.5)',\
+	junit-platform-commons;version='[1.11.4,1.11.5)',\
+	junit-platform-engine;version='[1.11.4,1.11.5)',\
+	junit-platform-launcher;version='[1.11.4,1.11.5)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
 	ch.qos.logback.core;version='[1.3.14,1.3.15)',\

From 62e60a6d8013a555a7a4009261ecf6a6c3aa9b76 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Sun, 2 Feb 2025 08:33:53 +0100
Subject: [PATCH 4/5] Upgrade californium to 4.0.0-M2

* Upgrade californium from 2.7.4 to 4.0.0-M2
* Replace special OH built net.i2p.crypto.eddsa by BouncyCastle
* Upgrade slf4j from 2.0.12 to 2.0.16

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/compile/pom.xml                           | 14 ++++-------
 bom/runtime/pom.xml                           | 24 +++++++++++--------
 .../openhab-tp/src/main/feature/feature.xml   | 13 +++++-----
 pom.xml                                       |  2 +-
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 718454336d5..d38e29dad9e 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -17,7 +17,7 @@
   <description>The dependencies that are used to compile the core bundles</description>
 
   <properties>
-    <californium.version>2.7.4</californium.version>
+    <californium.version>4.0.0-M2</californium.version>
     <jetty.version>9.4.57.v20241219</jetty.version>
     <pax.web.version>8.0.30</pax.web.version>
     <swagger.version>2.2.28</swagger.version>
@@ -103,17 +103,11 @@
       <groupId>org.eclipse.californium</groupId>
       <artifactId>element-connector</artifactId>
       <version>${californium.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>net.i2p.crypto</groupId>
-          <artifactId>eddsa</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.orbit.bundles</groupId>
-      <artifactId>net.i2p.crypto.eddsa</artifactId>
-      <version>0.3.0.v20220506-1020</version>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>californium-osgi</artifactId>
+      <version>${californium.version}</version>
     </dependency>
 
     <!-- Gson -->
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 4e14cccc7f9..e96e59de2bd 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -16,7 +16,7 @@
   <name>openHAB Core :: BOM :: Runtime</name>
 
   <properties>
-    <californium.version>2.7.4</californium.version>
+    <californium.version>4.0.0-M2</californium.version>
     <!-- cxf can be updated independently of karaf, only used in karaf tests -->
     <cxf.version>3.6.5</cxf.version>
     <jackson.version>2.18.2</jackson.version>
@@ -441,17 +441,21 @@
       <groupId>org.eclipse.californium</groupId>
       <artifactId>element-connector</artifactId>
       <version>${californium.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>net.i2p.crypto</groupId>
-          <artifactId>eddsa</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.orbit.bundles</groupId>
-      <artifactId>net.i2p.crypto.eddsa</artifactId>
-      <version>0.3.0.v20220506-1020</version>
+      <groupId>org.eclipse.californium</groupId>
+      <artifactId>californium-osgi</artifactId>
+      <version>${californium.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <version>1.78.1</version>
     </dependency>
 
     <!-- Gson -->
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index ddb074c7e36..74a30f929ea 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -41,12 +41,13 @@
 	</feature>
 
 	<feature name="openhab.tp-coap" description="Californium CoAP library" version="${project.version}">
-		<capability>openhab.tp;feature=coap;version=2.7.4</capability>
-		<bundle>mvn:org.eclipse.californium/californium-osgi/2.7.4</bundle>
-		<bundle>mvn:org.eclipse.californium/californium-core/2.7.4</bundle>
-		<bundle>mvn:org.eclipse.californium/element-connector/2.7.4</bundle>
-		<bundle>mvn:org.eclipse.californium/scandium/2.7.4</bundle>
-		<bundle>mvn:org.eclipse.orbit.bundles/net.i2p.crypto.eddsa/0.3.0.v20220506-1020</bundle>
+		<capability>openhab.tp;feature=coap;version=4.0.0-M2</capability>
+		<bundle>mvn:org.eclipse.californium/californium-osgi/4.0.0-M2</bundle>
+		<bundle>mvn:org.eclipse.californium/californium-core/4.0.0-M2</bundle>
+		<bundle>mvn:org.eclipse.californium/element-connector/4.0.0-M2</bundle>
+		<bundle>mvn:org.eclipse.californium/scandium/4.0.0-M2</bundle>
+		<bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/2.0.16</bundle>
+		<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.78.1</bundle>
 	</feature>
 
 	<feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}">
diff --git a/pom.xml b/pom.xml
index 164f401aec3..e7453c3b999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
     <karaf.compile.version>4.4.7</karaf.compile.version>
     <karaf.tooling.version>4.4.7</karaf.tooling.version>
     <sat.version>0.17.0</sat.version>
-    <slf4j.version>2.0.12</slf4j.version>
+    <slf4j.version>2.0.16</slf4j.version>
     <xtext.version>2.37.0</xtext.version>
     <spotless.version>2.43.0</spotless.version>
     <!-- Eclipse Java formatter version 4.26+ does not check test files -->

From becb014a6911cb04adf50c2ac899e1eddcc66e38 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 3 Feb 2025 07:08:48 +0100
Subject: [PATCH 5/5] Upgrade hamcrest to 3.0

* Upgrade hamcrest from 2.2 to 3.0

Release notes: https://github.com/hamcrest/JavaHamcrest/releases/tag/v3.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 bom/test/pom.xml                                                | 2 +-
 itests/org.openhab.core.addon.tests/itest.bndrun                | 2 +-
 itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun    | 2 +-
 .../org.openhab.core.automation.integration.tests/itest.bndrun  | 2 +-
 .../org.openhab.core.automation.module.core.tests/itest.bndrun  | 2 +-
 .../itest.bndrun                                                | 2 +-
 .../org.openhab.core.automation.module.timer.tests/itest.bndrun | 2 +-
 itests/org.openhab.core.automation.tests/itest.bndrun           | 2 +-
 itests/org.openhab.core.config.core.tests/itest.bndrun          | 2 +-
 .../org.openhab.core.config.discovery.mdns.tests/itest.bndrun   | 2 +-
 itests/org.openhab.core.config.discovery.tests/itest.bndrun     | 2 +-
 .../itest.bndrun                                                | 2 +-
 .../itest.bndrun                                                | 2 +-
 itests/org.openhab.core.config.dispatch.tests/itest.bndrun      | 2 +-
 itests/org.openhab.core.ephemeris.tests/itest.bndrun            | 2 +-
 itests/org.openhab.core.io.net.tests/itest.bndrun               | 2 +-
 itests/org.openhab.core.io.rest.core.tests/itest.bndrun         | 2 +-
 itests/org.openhab.core.model.item.tests/itest.bndrun           | 2 +-
 itests/org.openhab.core.model.rule.tests/itest.bndrun           | 2 +-
 itests/org.openhab.core.model.script.tests/itest.bndrun         | 2 +-
 itests/org.openhab.core.model.thing.tests/itest.bndrun          | 2 +-
 itests/org.openhab.core.storage.json.tests/itest.bndrun         | 2 +-
 itests/org.openhab.core.tests/itest.bndrun                      | 2 +-
 itests/org.openhab.core.thing.tests/itest.bndrun                | 2 +-
 itests/org.openhab.core.voice.tests/itest.bndrun                | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index c05d5e65f57..87acc5c3569 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 4ac038c9b66..23d5b69a3e9 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -14,7 +14,7 @@ Fragment-Host: org.openhab.core.addon
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
index 943baf368d3..96bf2fc1054 100644
--- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
+++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 8c1a985d0a6..57d145cfd85 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 2314bdb6eb0..ac92545d1ea 100644
--- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 5573a6dff94..fbee3e5a05c 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation.module.script
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 4a675196c18..688ab770a54 100644
--- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun
index 7a65008669b..64e72d98e32 100644
--- a/itests/org.openhab.core.automation.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.automation
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 47851f7c219..c5ff83e704c 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -11,7 +11,7 @@ Fragment-Host: org.openhab.core.config.core
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 38c0a9c8ff5..824063e63eb 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index 7f737b15d11..17a22ede3a0 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -11,7 +11,7 @@ Fragment-Host: org.openhab.core.config.discovery
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 b09f6ecd85b..fdb80cf021b 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
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
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 38d2885f439..ec559b7ec38 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -20,7 +20,7 @@ Provide-Capability: \
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 371bfec8366..91eddc8c5d9 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.config.dispatch
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 20461dfc6df..4a5be9e4241 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -15,7 +15,7 @@ feature.openhab-config: \
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 6c6eddd1630..0ecb20b706f 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -18,7 +18,7 @@ Fragment-Host: org.openhab.core.io.net
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.hamcrest;version='[3.0.0,3.0.1)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	si-units;version='[2.1.0,2.1.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 006a8887dd4..8c542b864f3 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -15,7 +15,7 @@ Fragment-Host: org.openhab.core.io.rest.core
 -runbundles: \
 	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
 	org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
-	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 3d05cbfbd68..e118902718a 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -15,7 +15,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index 605107213a6..b5d9b2501f3 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -18,7 +18,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index f1ab948d0d5..b90ab3080db 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -18,7 +18,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index f370dbf8f05..e463d869af6 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -16,7 +16,7 @@ Fragment-Host: org.openhab.core.model.thing
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index ee024efb11d..5d45af3458d 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core.storage.json
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun
index cd0003145aa..4109bbf675c 100644
--- a/itests/org.openhab.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.tests/itest.bndrun
@@ -10,7 +10,7 @@ Fragment-Host: org.openhab.core
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 199b8784f50..251b3af8883 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -14,7 +14,7 @@ Fragment-Host: org.openhab.core.thing
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index 2cf65a9feaa..4249dd281b8 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -14,7 +14,7 @@ Fragment-Host: org.openhab.core.voice
 #
 -runbundles: \
 	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.hamcrest;version='[3.0.0,3.0.1)',\
 	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)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\