Update bnd to 6.0.0 (#11359)

For release notes, see:

https://github.com/bndtools/bnd/wiki/Changes-in-6.0.0

Related to openhab/openhab-core#2514

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 5578055b1511b9a750a776ac5bafcb684da0bc4d..ecb7fd9df09dc4db9cb37011fe23c36a5dcca37a 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -26,9 +26,7 @@ Fragment-Host: org.openhab.binding.astro
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -51,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.storage.json;version='[3.2.0,3.2.1)',\
        org.openhab.core.thing;version='[3.2.0,3.2.1)',\
        org.apache.felix.scr;version='[2.1.28,2.1.29)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 7d7e205d3af0c6d15cdd4eb7f18bc833247d5af2..23bf948a88b5594e802a6bacc16bafb449383f1d 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 0428c2d19bb6c351e711badae3d90e3d3d9cb52c..19572ada11ae7e8f99ee7735da92d324801c7858 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.binding.feed
        junit-platform-engine;version='[1.7.0,1.7.1)',\
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.feed
        org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 0e7f76ea904216955e578e019e9306bc16b28297..f9a5396568b133d491a9d847c4f36c663e512a32 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -32,7 +32,6 @@ Fragment-Host: org.openhab.binding.hue
        junit-platform-engine;version='[1.7.0,1.7.1)',\
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -79,4 +78,5 @@ Fragment-Host: org.openhab.binding.hue
        org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 82a0731d6c6f3b8f9e56b26c0a970ff877860af6..850570bdbf96889f4431679c4c0edd957c80b5b8 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.binding.max
        junit-platform-engine;version='[1.7.0,1.7.1)',\
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.max
        org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index ae7a0069fb265ae96b4b3090ee5029122b2a1eee..47773da6de74d5caa355784bb71603a16b7055cb 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -34,7 +34,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
@@ -85,4 +84,5 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index efe7dc00d596fa4b38468a41ac51a5f1bfdd1e5f..c97da2062aaa878d7c4ed1d470ad7fc669784211 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -38,7 +38,6 @@ Fragment-Host: org.openhab.binding.modbus
        org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
        junit-jupiter-params;version='[5.7.0,5.7.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.modbus
        org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 1432138eaf6eb98882ab1a768512f0072fb3f6db..47d18d4204d22a20800dc00e9864ba149ac7b104 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -37,7 +37,6 @@ Fragment-Host: org.openhab.binding.nest
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -104,4 +103,5 @@ Fragment-Host: org.openhab.binding.nest
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 75f5fee16074c973fddd537488f76e603cf5cc84..b83fea44b3855154a3cdfdd773db77185d82e4a4 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.ntp
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -70,4 +69,5 @@ Fragment-Host: org.openhab.binding.ntp
        org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index f71325316b548e24e12fb796feb7313930afb26d..9f636c59fdd24455ebdd614ef00c2f828bca23ca 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -36,9 +36,7 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -74,4 +72,5 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
        com.sun.jna;version='[5.9.0,5.9.1)',\
-       com.sun.jna.platform;version='[5.9.0,5.9.1)'
+       com.sun.jna.platform;version='[5.9.0,5.9.1)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index a58fc6119318512ec408c6b81c5fe1eb0ec0ea7f..866ac19bc6a30fe53ea1e00e6a773d8ba185190d 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -39,7 +39,6 @@ Fragment-Host: org.openhab.binding.tradfri
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.tradfri
        org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 0d2772fa73ce0994bf909c86880934a9fa3f8247..0e5f8e0e7a143a26f9a05f473cb06ecf4ea298d8 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -35,7 +35,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.mockito.mockito-core;version='[3.7.0,3.7.1)',\
        org.objenesis;version='[3.1.0,3.1.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -83,4 +82,5 @@ Fragment-Host: org.openhab.binding.wemo
        org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)'
+       org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 548b19f041236d1cc6dec8d29790d3a877a55a10..2740fe5e9a2ef7b2a2e552dfa2d07fd1f6a19ef9 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.persistence.mapdb
        junit-platform-engine;version='[1.7.0,1.7.1)',\
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-       biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
@@ -57,4 +56,5 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\
+       biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)'

diff --git a/pom.xml b/pom.xml
index 3072d6b55acbbc59c67b85bed2e4cbbcbe205e85..81cf0a7e9087e7ec5c6f304322109de25cafcbdc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
     <ohc.version>3.2.0-SNAPSHOT</ohc.version>
-    <bnd.version>5.3.0</bnd.version>
+    <bnd.version>6.0.0</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.12.3</jackson.version>