]> git.basschouten.com Git - openhab-addons.git/commitdiff
Upgrade bnd to 6.4.0 (#13890)
authorJ-N-K <github@klug.nrw>
Fri, 9 Dec 2022 20:23:53 +0000 (21:23 +0100)
committerGitHub <noreply@github.com>
Fri, 9 Dec 2022 20:23:53 +0000 (21:23 +0100)
* Upgrade bnd to 6.4.0

Signed-off-by: Jan N. Klug <github@klug.nrw>
16 files changed:
itests/org.openhab.binding.astro.tests/itest.bndrun
itests/org.openhab.binding.avmfritz.tests/itest.bndrun
itests/org.openhab.binding.feed.tests/itest.bndrun
itests/org.openhab.binding.hue.tests/itest.bndrun
itests/org.openhab.binding.max.tests/itest.bndrun
itests/org.openhab.binding.mielecloud.tests/itest.bndrun
itests/org.openhab.binding.modbus.tests/itest.bndrun
itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
itests/org.openhab.binding.nest.tests/itest.bndrun
itests/org.openhab.binding.ntp.tests/itest.bndrun
itests/org.openhab.binding.systeminfo.tests/itest.bndrun
itests/org.openhab.binding.tradfri.tests/itest.bndrun
itests/org.openhab.binding.wemo.tests/itest.bndrun
itests/org.openhab.persistence.mapdb.tests/itest.bndrun
pom.xml

index b120539fdf424f130a15fea74ae4bdfafd34c8d4..4eeea1a18b1994b762586ca5a1e7d9ac22e97439 100644 (file)
@@ -41,7 +41,6 @@ Fragment-Host: org.openhab.binding.astro
        com.google.gson;version='[2.8.9,2.8.10)',\
        org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.astro;version='[3.4.0,3.4.1)',\
        org.openhab.binding.astro.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -49,4 +48,6 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.config.discovery;version='[3.4.0,3.4.1)',\
        org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
        org.openhab.core.storage.json;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 3b4ea885e6e79878c52f24af3f57185a03011380..a38f433bbc203b0ec70b534b93681ebcbf65abf1 100644 (file)
@@ -66,7 +66,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.jupnp;version='[2.6.1,2.6.2)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.avmfritz;version='[3.4.0,3.4.1)',\
        org.openhab.binding.avmfritz.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
        org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 2f90b0b1e27a8c3be5f8096de02a8d7a85da81e2..4b8b8d380bf6cfb6d91fbe36f597c5b18db5f16a 100644 (file)
@@ -67,7 +67,6 @@ Fragment-Host: org.openhab.binding.feed
        org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.feed;version='[3.4.0,3.4.1)',\
        org.openhab.binding.feed.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.feed
        org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
index 8ddabc812be49cc0cf11f77231c74ed186b5da06..4ab8a0f3b39a20cf992b6285005898c53c9940bd 100644 (file)
@@ -78,6 +78,7 @@ Fragment-Host: org.openhab.binding.hue
        org.objenesis;version='[3.2.0,3.2.1)',\
        org.openhab.core.config.discovery.mdns;version='[3.4.0,3.4.1)',\
        org.openhab.core.io.transport.mdns;version='[3.4.0,3.4.1)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
-       ch.qos.logback.core;version='[1.2.11,1.2.12)'
+       ch.qos.logback.core;version='[1.2.11,1.2.12)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 28c8444f85949681fb9b19b1ef2851ec515506ac..bfddf41cd5c34301673fd8e291ca0229699b6d26 100644 (file)
@@ -56,7 +56,6 @@ Fragment-Host: org.openhab.binding.max
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.max;version='[3.4.0,3.4.1)',\
        org.openhab.binding.max.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -67,4 +66,6 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index e6f22b85c83e18c7c69246d1c96e7da24f97fafa..950dc22b1de9bc56137d8d4821da3fc7fdae7581 100644 (file)
@@ -73,7 +73,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.mielecloud;version='[3.4.0,3.4.1)',\
        org.openhab.binding.mielecloud.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -86,4 +85,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 18d8ae971b1d4034dd35a8beb4af57c32532c51f..c21a990e9c21a9b42405d11e35a045c11b388cbf 100644 (file)
@@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.modbus
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.modbus;version='[3.4.0,3.4.1)',\
        org.openhab.binding.modbus.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,6 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-       org.openhab.core.transform;version='[3.4.0,3.4.1)'
+       org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index a53b174a1123e35fff3af89a791c185428d8eb01..15406f640d965ec7452c607878c24656931086c9 100644 (file)
@@ -95,7 +95,6 @@ Import-Package: \
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.mqtt;version='[3.4.0,3.4.1)',\
        org.openhab.binding.mqtt.generic;version='[3.4.0,3.4.1)',\
        org.openhab.binding.mqtt.homeassistant;version='[3.4.0,3.4.1)',\
@@ -110,4 +109,7 @@ Import-Package: \
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-       org.openhab.core.transform;version='[3.4.0,3.4.1)'
+       org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index fe878683b1d8883ec6a3c0c75d3aa57d25ce14c2..c2145286a0a2d387793c657b5c97344f734d561c 100644 (file)
@@ -95,7 +95,6 @@ Import-Package: \
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.mqtt;version='[3.4.0,3.4.1)',\
        org.openhab.binding.mqtt.generic;version='[3.4.0,3.4.1)',\
        org.openhab.binding.mqtt.homie;version='[3.4.0,3.4.1)',\
@@ -110,5 +109,8 @@ Import-Package: \
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
-       org.openhab.core.transform;version='[3.4.0,3.4.1)'
+       org.openhab.core.transform;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
 
index 45705c2640a8e4b59c9cb503844d40f4a73d1bfc..03588b51a675e18faff9ca1e3044d627f8212b3f 100644 (file)
@@ -92,7 +92,6 @@ Fragment-Host: org.openhab.binding.nest
        org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.nest;version='[3.4.0,3.4.1)',\
        org.openhab.binding.nest.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -105,4 +104,7 @@ Fragment-Host: org.openhab.binding.nest
        org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.jsr-305;version='[3.0.2,3.0.3)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 5587c500453d1d734cfc46979f0224f379a3f686..03d2fe960b6274276d5f11ff66aaab1049f128e1 100644 (file)
@@ -59,7 +59,6 @@ Fragment-Host: org.openhab.binding.ntp
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.ntp;version='[3.4.0,3.4.1)',\
        org.openhab.binding.ntp.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -72,4 +71,5 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
        org.apache.commons.commons-net;version='[3.9.0,3.9.1)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
index 022b2e258e37244d9bd24fb9110570396bcf2fdf..abc5e956436e3f7f8ffff362cfdecbeddd841c8b 100644 (file)
@@ -63,7 +63,6 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.systeminfo;version='[3.4.0,3.4.1)',\
        org.openhab.binding.systeminfo.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
        org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
-       com.github.oshi.oshi-core;version='[6.2.2,6.2.3)'
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index 351ce3454c16e3a3689e7fd86b70bc3fe41885d5..c867eb024be7a8fc93a5a2183a9259420e462e94 100644 (file)
@@ -61,7 +61,6 @@ Fragment-Host: org.openhab.binding.tradfri
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.tradfri;version='[3.4.0,3.4.1)',\
        org.openhab.binding.tradfri.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -79,4 +78,5 @@ Fragment-Host: org.openhab.binding.tradfri
        org.osgi.service.cm;version='[1.6.0,1.6.1)',\
        org.eclipse.californium.core;version='[2.7.4,2.7.5)',\
        org.eclipse.californium.element-connector;version='[2.7.4,2.7.5)',\
-       org.eclipse.californium.scandium;version='[2.7.4,2.7.5)'
+       org.eclipse.californium.scandium;version='[2.7.4,2.7.5)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
index e163b0ec36397d3c267f8445fdda2d2a5a8b50e0..ca8777c87e9f8039c72f7e874ea6ff2ee011c8c7 100644 (file)
@@ -70,7 +70,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.jupnp;version='[2.6.1,2.6.2)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.binding.wemo;version='[3.4.0,3.4.1)',\
        org.openhab.binding.wemo.tests;version='[3.4.0,3.4.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
@@ -84,4 +83,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.io.transport.upnp;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.core.thing;version='[3.4.0,3.4.1)',\
-       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
+       org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
+       org.osgi.service.cm;version='[1.6.0,1.6.1)'
index bdaef3d0f1ef402b31af9dd78c5095c6f5815793..04b8c2e82f4a1368a5f811da74ddd9be23175ccd 100644 (file)
@@ -53,10 +53,10 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
        ch.qos.logback.core;version='[1.2.11,1.2.12)',\
-       biz.aQute.tester.junit-platform;version='[6.3.0,6.3.1)',\
        org.openhab.core;version='[3.4.0,3.4.1)',\
        org.openhab.core.config.core;version='[3.4.0,3.4.1)',\
        org.openhab.core.persistence;version='[3.4.0,3.4.1)',\
        org.openhab.core.test;version='[3.4.0,3.4.1)',\
        org.openhab.persistence.mapdb;version='[3.4.0,3.4.1)',\
-       org.openhab.persistence.mapdb.tests;version='[3.4.0,3.4.1)'
+       org.openhab.persistence.mapdb.tests;version='[3.4.0,3.4.1)',\
+       biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)'
diff --git a/pom.xml b/pom.xml
index 0613ca02ebb8843453d03f383eeb1bdd0fe8e0a0..5214b2238679147645917350602f099aa36b0d04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
     <ohc.version>3.4.0-SNAPSHOT</ohc.version>
-    <bnd.version>6.3.0</bnd.version>
+    <bnd.version>6.4.0</bnd.version>
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.12.7</jackson.version>