Update bnd to 7.0.0 (openhab#15709)

For release notes, see: https://github.com/bndtools/bnd/wiki/Changes-in-7.0.0 Signed-off-by: Wouter Born <[email protected]>
morph166955 · Oct 6, 2023 · 181c647 · 181c647
1 parent 0157ebf
commit 181c647
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 35 deletions.
diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
@@ -16,7 +16,6 @@ Fragment-Host: org.openhab.automation.groovyscripting
 # done
 #
 -runbundles: \
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	jakarta.annotation-api;version='[1.3.5,1.3.6)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
@@ -84,4 +83,5 @@ Fragment-Host: org.openhab.automation.groovyscripting
 	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.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
 	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)',\
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@@ -78,4 +77,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
 	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.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -19,7 +19,6 @@ Fragment-Host: org.openhab.binding.astro
 	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.osgi.service.component;version='[1.5.0,1.5.1)',\
 	junit-jupiter-api;version='[5.9.2,5.9.3)',\
@@ -55,4 +54,5 @@ Fragment-Host: org.openhab.binding.astro
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\
 	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)'
+	com.google.gson;version='[2.10.1,2.10.2)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -24,7 +24,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	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)',\
@@ -87,4 +86,5 @@ Fragment-Host: org.openhab.binding.avmfritz
 	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.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.feed
 	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)',\
@@ -80,4 +79,5 @@ Fragment-Host: org.openhab.binding.feed
 	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.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -29,7 +29,6 @@ Fragment-Host: org.openhab.binding.hue
 	org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
 	javax.jmdns;version='[3.5.8,3.5.9)',\
 	org.jupnp;version='[2.7.1,2.7.2)',\
-	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)',\
@@ -93,4 +92,5 @@ Fragment-Host: org.openhab.binding.hue
 	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.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.max
 	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.binding.max
 	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.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.binding.mielecloud
 	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)',\
@@ -93,4 +92,5 @@ Fragment-Host: org.openhab.binding.mielecloud
 	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.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.modbus
 	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 @@ Fragment-Host: org.openhab.binding.modbus
 	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.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -44,7 +44,6 @@ Import-Package: \
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
 	io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	org.apache.commons.commons-codec;version='[1.15.0,1.15.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)',\
@@ -114,4 +113,5 @@ Import-Package: \
 	io.netty.transport;version='[4.1.99,4.1.100)',\
 	io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
-	reactive-streams;version='[1.0.4,1.0.5)'
+	reactive-streams;version='[1.0.4,1.0.5)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -44,7 +44,6 @@ Import-Package: \
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
 	io.dropwizard.metrics.core;version='[3.2.2,3.2.3)',\
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	org.apache.commons.commons-codec;version='[1.15.0,1.15.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)',\
@@ -114,5 +113,6 @@ Import-Package: \
 	io.netty.transport;version='[4.1.99,4.1.100)',\
 	io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
-	reactive-streams;version='[1.0.4,1.0.5)'
+	reactive-streams;version='[1.0.4,1.0.5)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
 
diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
@@ -26,7 +26,6 @@ Import-Package: \
 # done
 #
 -runbundles: \
-	biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
 	com.google.dagger;version='[2.27.0,2.27.1)',\
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
@@ -115,4 +114,5 @@ Import-Package: \
 	io.netty.transport;version='[4.1.99,4.1.100)',\
 	io.netty.transport-native-unix-common;version='[4.1.99,4.1.100)',\
 	io.reactivex.rxjava2.rxjava;version='[2.2.21,2.2.22)',\
-	reactive-streams;version='[1.0.4,1.0.5)'
+	reactive-streams;version='[1.0.4,1.0.5)',\
+	biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)'
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -26,7 +26,6 @@ Fragment-Host: org.openhab.binding.ntp
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.apache.commons.commons-net;version='[3.9.0,3.9.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)',\
@@ -77,4 +76,5 @@ Fragment-Host: org.openhab.binding.ntp
 	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.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.binding.systeminfo
 	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)',\
@@ -80,4 +79,5 @@ Fragment-Host: org.openhab.binding.systeminfo
 	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.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.binding.tradfri
 	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)',\
-	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)',\
@@ -84,4 +83,5 @@ Fragment-Host: org.openhab.binding.tradfri
 	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.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -25,7 +25,6 @@ Fragment-Host: org.openhab.binding.wemo
 	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)',\
@@ -89,4 +88,5 @@ Fragment-Host: org.openhab.binding.wemo
 	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.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -27,7 +27,6 @@ Fragment-Host: org.openhab.persistence.mapdb
 	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)',\
@@ -71,4 +70,5 @@ Fragment-Host: org.openhab.persistence.mapdb
 	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
@@ -69,7 +69,7 @@
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
     <ohc.version>4.1.0-SNAPSHOT</ohc.version>
-    <bnd.version>6.4.0</bnd.version>
+    <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.9.0</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.15.2</jackson.version>