From f8bcfb0c7ebfda5d26f0b05231d9e960c86bb913 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 7 Oct 2023 20:35:40 +0200 Subject: [PATCH] Resolve runbundles for JUnit upgrade (#15714) Signed-off-by: Wouter Born --- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../org.openhab.binding.astro.tests/itest.bndrun | 16 ++++++++-------- .../itest.bndrun | 14 +++++++------- .../org.openhab.binding.feed.tests/itest.bndrun | 14 +++++++------- .../org.openhab.binding.hue.tests/itest.bndrun | 14 +++++++------- .../org.openhab.binding.max.tests/itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 16 ++++++++-------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 16 ++++++++-------- .../org.openhab.binding.ntp.tests/itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../org.openhab.binding.wemo.tests/itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- 17 files changed, 122 insertions(+), 122 deletions(-) diff --git a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun index f4d61e1a058..c79e79ea674 100644 --- a/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun +++ b/itests/org.openhab.automation.groovyscripting.tests/itest.bndrun @@ -25,7 +25,6 @@ Fragment-Host: org.openhab.automation.groovyscripting org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\ si-units;version='[2.1.0,2.1.1)',\ @@ -33,11 +32,6 @@ Fragment-Host: org.openhab.automation.groovyscripting 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ xstream;version='[1.4.20,1.4.21)',\ org.openhab.automation.groovyscripting;version='[4.1.0,4.1.1)',\ org.openhab.automation.groovyscripting.tests;version='[4.1.0,4.1.1)',\ @@ -84,4 +78,10 @@ Fragment-Host: org.openhab.automation.groovyscripting 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun index 41542dd4f29..e26af85a264 100644 --- a/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun +++ b/itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -32,11 +31,6 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ xstream;version='[1.4.20,1.4.21)',\ org.openhab.automation.jsscriptingnashorn;version='[4.1.0,4.1.1)',\ org.openhab.automation.jsscriptingnashorn.tests;version='[4.1.0,4.1.1)',\ @@ -78,4 +72,10 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index 217dbcc7d6a..1dc6807ff9e 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -9,7 +9,6 @@ Fragment-Host: org.openhab.binding.astro # done # -runbundles: \ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -21,12 +20,6 @@ Fragment-Host: org.openhab.binding.astro org.osgi.util.function;version='[1.2.0,1.2.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)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -55,4 +48,11 @@ Fragment-Host: org.openhab.binding.astro 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index 4d6bb021760..7131e1088d0 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -14,7 +14,6 @@ Fragment-Host: org.openhab.binding.avmfritz # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -28,11 +27,6 @@ Fragment-Host: org.openhab.binding.avmfritz org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ org.jupnp;version='[2.7.1,2.7.2)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -87,4 +81,10 @@ Fragment-Host: org.openhab.binding.avmfritz 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index 0d986608933..790734b8487 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.binding.feed # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -30,11 +29,6 @@ Fragment-Host: org.openhab.binding.feed 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ xstream;version='[1.4.20,1.4.21)',\ org.openhab.binding.feed;version='[4.1.0,4.1.1)',\ org.openhab.binding.feed.tests;version='[4.1.0,4.1.1)',\ @@ -80,4 +74,10 @@ Fragment-Host: org.openhab.binding.feed 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index 73a4d70cbbe..f451b63180e 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.hue # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -32,11 +31,6 @@ Fragment-Host: org.openhab.binding.hue 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -93,4 +87,10 @@ Fragment-Host: org.openhab.binding.hue 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 7f8f50ce73c..c6471bb95d4 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.binding.max # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -29,11 +28,6 @@ Fragment-Host: org.openhab.binding.max 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ xstream;version='[1.4.20,1.4.21)',\ org.openhab.binding.max;version='[4.1.0,4.1.1)',\ org.openhab.binding.max.tests;version='[4.1.0,4.1.1)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.binding.max 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index 22aec6c4b33..90927399eaa 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.mielecloud -runbundles: \ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ @@ -28,11 +27,6 @@ Fragment-Host: org.openhab.binding.mielecloud 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -93,4 +87,10 @@ Fragment-Host: org.openhab.binding.mielecloud 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index 3dff62d2554..5ca6488b3c1 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.binding.modbus -runbundles: \ nrjavaserial;version='[5.2.1,5.2.2)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -30,12 +29,6 @@ Fragment-Host: org.openhab.binding.modbus 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ @@ -81,4 +74,11 @@ Fragment-Host: org.openhab.binding.modbus 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 49fa8041e44..fe4eeb366b6 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -29,7 +29,6 @@ Import-Package: \ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.jctools.core;version='[2.1.2,2.1.3)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ com.google.dagger;version='[2.27.0,2.27.1)',\ @@ -48,11 +47,6 @@ Import-Package: \ 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ @@ -114,4 +108,10 @@ Import-Package: \ 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun index a501e6ec7d0..8209bcd1393 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun @@ -29,7 +29,6 @@ Import-Package: \ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.jctools.core;version='[2.1.2,2.1.3)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ com.google.dagger;version='[2.27.0,2.27.1)',\ @@ -48,11 +47,6 @@ Import-Package: \ 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ @@ -114,5 +108,11 @@ Import-Package: \ 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun index fed066ac171..ae0e0129634 100644 --- a/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun @@ -34,12 +34,6 @@ Import-Package: \ io.netty.transport-native-epoll;version='[4.1.59,4.1.60)',\ 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)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ 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)',\ @@ -49,7 +43,6 @@ Import-Package: \ org.hamcrest;version='[2.2.0,2.2.1)',\ org.jctools.core;version='[2.1.2,2.1.3)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ si-units;version='[2.1.0,2.1.1)',\ @@ -115,4 +108,11 @@ Import-Package: \ 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 3d0ae4e8ef5..1b27f293c0b 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.binding.ntp # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -29,11 +28,6 @@ Fragment-Host: org.openhab.binding.ntp 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -77,4 +71,10 @@ Fragment-Host: org.openhab.binding.ntp 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index d7593b52820..cf1880ee0ef 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.binding.systeminfo # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -30,11 +29,6 @@ Fragment-Host: org.openhab.binding.systeminfo 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ @@ -80,4 +74,10 @@ Fragment-Host: org.openhab.binding.systeminfo 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 2b3486472d2..3df040cf45b 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.tradfri -runbundles: \ javax.jmdns;version='[3.5.8,3.5.9)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -33,11 +32,6 @@ Fragment-Host: org.openhab.binding.tradfri 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\ @@ -84,4 +78,10 @@ Fragment-Host: org.openhab.binding.tradfri 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index 010197376b1..aa1e3154247 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.binding.wemo # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -29,11 +28,6 @@ Fragment-Host: org.openhab.binding.wemo org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ org.jupnp;version='[2.7.1,2.7.2)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\ net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ @@ -89,4 +83,10 @@ Fragment-Host: org.openhab.binding.wemo 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 54232174e09..b79dddf05a7 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.persistence.mapdb # -runbundles: \ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.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)',\ @@ -30,11 +29,6 @@ Fragment-Host: org.openhab.persistence.mapdb 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)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ xstream;version='[1.4.20,1.4.21)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ @@ -71,4 +65,10 @@ Fragment-Host: org.openhab.persistence.mapdb 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)',\ - biz.aQute.tester.junit-platform;version='[7.0.0,7.0.1)' + biz.aQute.tester.junit-platform;version='[7.0.0,7.0.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)',\ + org.opentest4j;version='[1.3.0,1.3.1)'