From fb3d4e805d06ad1b985566c4669909ffc3580644 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Fri, 6 Oct 2023 18:45:20 +0200 Subject: [PATCH] Update bnd to 7.0.0 (#3828) For release notes, see: https://github.com/bndtools/bnd/wiki/Changes-in-7.0.0 Signed-off-by: Wouter Born --- itests/org.openhab.core.addon.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- itests/org.openhab.core.automation.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.config.core.tests/itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- itests/org.openhab.core.config.discovery.tests/itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- .../itest.bndrun | 4 ++-- itests/org.openhab.core.config.dispatch.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.ephemeris.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.io.net.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.io.rest.core.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.model.item.tests/itest.bndrun | 5 +++-- itests/org.openhab.core.model.rule.tests/itest.bndrun | 5 +++-- itests/org.openhab.core.model.script.tests/itest.bndrun | 5 +++-- itests/org.openhab.core.model.thing.tests/itest.bndrun | 5 +++-- itests/org.openhab.core.storage.json.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.thing.tests/itest.bndrun | 4 ++-- itests/org.openhab.core.voice.tests/itest.bndrun | 4 ++-- pom.xml | 2 +- 25 files changed, 53 insertions(+), 49 deletions(-) diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index e7248d32b..e1d82e230 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -24,7 +24,6 @@ Fragment-Host: org.openhab.core.addon si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -67,4 +66,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 29b0a7a78..b6fbb3831 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -75,4 +74,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 6f972acc8..662cf6c78 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 68f670a8f..95537c6f0 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 288244ad7..70a08dcdb 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation.module.script si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -70,4 +69,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index f25114937..faae84090 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 30bb63297..540e3e1de 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -22,7 +22,6 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 003140113..59247bdc8 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.core si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -68,4 +67,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index fae608590..90293f1d3 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ javax.jmdns;version='[3.5.8,3.5.9)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 9e36b90a4..e8fcfa473 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.config.discovery si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -72,4 +71,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index db3061a1a..232988ecc 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 @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index 1a6aff534..cbf01a8f2 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -30,7 +30,6 @@ Provide-Capability: \ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -81,4 +80,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index acc4be349..9a95ac0aa 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.config.dispatch si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -61,4 +60,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 125d983e4..5b8891f26 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -27,7 +27,6 @@ feature.openhab-config: \ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -70,4 +69,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 64d6032cf..6f2dee765 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -10,7 +10,6 @@ Fragment-Host: org.openhab.core.io.net bnd.identity;id='org.apache.aries.spifly.dynamic.bundle' -runbundles: \ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ junit-jupiter-api;version='[5.9.2,5.9.3)',\ @@ -73,4 +72,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 94e0d2b23..9cb4978ee 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.io.rest.core si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -104,4 +103,5 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.cxf.cxf-rt-rs-sse;version='[3.6.2,3.6.3)',\ org.apache.cxf.cxf-rt-security;version='[3.6.2,3.6.3)',\ org.apache.cxf.cxf-rt-transports-http;version='[3.6.2,3.6.3)',\ - org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)' + org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 91ced2f5a..6de48e730 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -28,7 +28,6 @@ Fragment-Host: org.openhab.core.model.item si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -119,4 +118,6 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ + org.openhab.core.model.sitemap.runtime;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index a3397dbac..8ea4285fa 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -123,4 +122,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ + org.openhab.core.model.sitemap.runtime;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 7d4908606..622210a2c 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.model.script si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -126,4 +125,6 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ + org.openhab.core.model.sitemap.runtime;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index aed2bfa9a..764e935b8 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -29,7 +29,6 @@ Fragment-Host: org.openhab.core.model.thing si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -128,4 +127,6 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.util;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase;version='[2.32.0,2.32.1)',\ org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.1)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)',\ + org.openhab.core.model.sitemap.runtime;version='[4.1.0,4.1.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index a2541cc23..fc5d29024 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.storage.json si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -66,4 +65,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 81c31308b..da740e3fd 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -65,4 +64,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index bf6c40836..a00418f2e 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -24,7 +24,6 @@ Fragment-Host: org.openhab.core.thing si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -74,4 +73,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 9fe918aa3..ce8118347 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -24,7 +24,6 @@ Fragment-Host: org.openhab.core.voice si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ @@ -79,4 +78,5 @@ 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.10.1,2.10.2)',\ - org.objectweb.asm;version='[9.5.0,9.5.1)' + org.objectweb.asm;version='[9.5.0,9.5.1)',\ + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' diff --git a/pom.xml b/pom.xml index 70dfe85ed..511284603 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ ${oh.java.version} ${oh.java.version} - 6.4.0 + 7.0.0 3.7.2 2.3.0 4.4.4