From eff85c64709ea360507755c8ced62a14918903a8 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sat, 7 Oct 2023 20:34:47 +0200 Subject: [PATCH] Upgrade JUnit to 5.10.0 (#3832) Upgrades JUnit from 5.9.2 to 5.10.0. For release notes, see: https://junit.org/junit5/docs/5.10.0/release-notes/#release-notes-5.10.0 Signed-off-by: Wouter Born --- bom/test-index/pom.xml | 4 ++-- bom/test/pom.xml | 2 +- itests/org.openhab.core.addon.tests/itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../org.openhab.core.io.net.tests/itest.bndrun | 14 +++++++------- .../itest.bndrun | 16 ++++++++-------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 14 +++++++------- .../itest.bndrun | 16 ++++++++-------- .../itest.bndrun | 14 +++++++------- itests/org.openhab.core.tests/itest.bndrun | 14 +++++++------- itests/org.openhab.core.thing.tests/itest.bndrun | 14 +++++++------- itests/org.openhab.core.voice.tests/itest.bndrun | 16 ++++++++-------- 26 files changed, 174 insertions(+), 174 deletions(-) diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index e70635ef6..03525fcad 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -19,12 +19,12 @@ org.junit.jupiter junit-jupiter-engine - 5.9.2 + 5.10.0 org.junit.platform junit-platform-launcher - 1.9.2 + 1.10.0 biz.aQute.bnd diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 11b734973..90ac8d337 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -17,7 +17,7 @@ 3.6.2 - 5.9.2 + 5.10.0 4.11.0 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index e1d82e230..c3faaf10c 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.core.addon -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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.core.addon org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.addon;version='[4.1.0,4.1.1)',\ org.openhab.core.addon.tests;version='[4.1.0,4.1.1)',\ @@ -67,4 +61,10 @@ Fragment-Host: org.openhab.core.addon 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.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index b6fbb3831..596b90a0a 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -23,11 +22,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client 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)',\ @@ -75,4 +69,10 @@ Fragment-Host: org.openhab.core.auth.oauth2client 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.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 662cf6c78..8f9d96a88 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.automation -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -26,11 +25,6 @@ Fragment-Host: org.openhab.core.automation org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.automation 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.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index 95537c6f0..cb690a45c 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.automation -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -26,11 +25,6 @@ Fragment-Host: org.openhab.core.automation org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.automation 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.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 70a08dcdb..b496aae3a 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.automation.module.script -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -26,11 +25,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.automation;version='[4.1.0,4.1.1)',\ org.openhab.core.automation.module.script;version='[4.1.0,4.1.1)',\ @@ -70,4 +64,10 @@ Fragment-Host: org.openhab.core.automation.module.script 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.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index faae84090..d0d61a65f 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.automation -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -26,11 +25,6 @@ Fragment-Host: org.openhab.core.automation org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.automation 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.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 540e3e1de..e220fd308 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.automation -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -26,11 +25,6 @@ Fragment-Host: org.openhab.core.automation org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.automation 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.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 59247bdc8..5d289963d 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -12,7 +12,6 @@ Fragment-Host: org.openhab.core.config.core -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -25,11 +24,6 @@ Fragment-Host: org.openhab.core.config.core org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -68,4 +62,10 @@ Fragment-Host: org.openhab.core.config.core 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.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index 90293f1d3..d6c8b40cd 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -25,11 +24,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.config.discovery.mdns 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.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index e8fcfa473..12374d10a 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -12,7 +12,6 @@ Fragment-Host: org.openhab.core.config.discovery -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -25,11 +24,6 @@ Fragment-Host: org.openhab.core.config.discovery org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -72,4 +66,10 @@ Fragment-Host: org.openhab.core.config.discovery 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.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 232988ecc..08789b081 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 @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -24,11 +23,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs 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.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index cbf01a8f2..ec43afcbd 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -21,7 +21,6 @@ Provide-Capability: \ -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -34,11 +33,6 @@ Provide-Capability: \ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -81,4 +75,10 @@ Provide-Capability: \ 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.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 9a95ac0aa..c4f0e7a9d 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.config.dispatch -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -23,11 +22,6 @@ Fragment-Host: org.openhab.core.config.dispatch 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.config.dispatch;version='[4.1.0,4.1.1)',\ org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\ @@ -61,4 +55,10 @@ Fragment-Host: org.openhab.core.config.dispatch 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.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 5b8891f26..6b881ac61 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -16,7 +16,6 @@ feature.openhab-config: \ -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -31,11 +30,6 @@ feature.openhab-config: \ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ org.openhab.core.ephemeris;version='[4.1.0,4.1.1)',\ @@ -70,4 +64,10 @@ feature.openhab-config: \ 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.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 6f2dee765..996bc3caf 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -12,11 +12,6 @@ Fragment-Host: org.openhab.core.io.net -runbundles: \ 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-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.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ @@ -24,7 +19,6 @@ Fragment-Host: org.openhab.core.io.net org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ - 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)',\ @@ -73,4 +67,10 @@ Fragment-Host: org.openhab.core.io.net 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.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index 9cb4978ee..ebd98c999 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -16,7 +16,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\ 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,12 +31,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -104,4 +97,11 @@ Fragment-Host: org.openhab.core.io.rest.core 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)',\ - 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.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 6de48e730..1d623c10b 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -17,7 +17,6 @@ Fragment-Host: org.openhab.core.model.item org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -32,11 +31,6 @@ Fragment-Host: org.openhab.core.model.item org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.audio;version='[4.1.0,4.1.1)',\ org.openhab.core.automation;version='[4.1.0,4.1.1)',\ @@ -120,4 +114,10 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.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)' + 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.openhab.core.model.persistence.runtime;version='[4.1.0,4.1.1)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 8ea4285fa..61b105645 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -21,7 +21,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -37,11 +36,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.audio;version='[4.1.0,4.1.1)',\ org.openhab.core.automation;version='[4.1.0,4.1.1)',\ @@ -124,4 +118,10 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.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)' + 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.openhab.core.model.persistence.runtime;version='[4.1.0,4.1.1)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 622210a2c..4d86d0f98 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -20,7 +20,6 @@ Fragment-Host: org.openhab.core.model.script org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -36,11 +35,6 @@ Fragment-Host: org.openhab.core.model.script org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -127,4 +121,10 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.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)' + 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.openhab.core.model.persistence.runtime;version='[4.1.0,4.1.1)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 764e935b8..525927393 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -18,7 +18,6 @@ Fragment-Host: org.openhab.core.model.thing org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ com.google.guava.failureaccess;version='[1.0.1,1.0.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)',\ jollyday;version='[0.5.10,0.5.11)',\ @@ -33,12 +32,6 @@ Fragment-Host: org.openhab.core.model.thing org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -129,4 +122,11 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.xbase.lib;version='[2.32.0,2.32.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)' + 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.openhab.core.model.persistence.runtime;version='[4.1.0,4.1.1)',\ + org.opentest4j;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index fc5d29024..e36d3be20 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core.storage.json -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -24,11 +23,6 @@ Fragment-Host: org.openhab.core.storage.json org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ org.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ org.openhab.core.io.console;version='[4.1.0,4.1.1)',\ @@ -66,4 +60,10 @@ Fragment-Host: org.openhab.core.storage.json 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.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index da740e3fd..81c37d21d 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -11,7 +11,6 @@ Fragment-Host: org.openhab.core -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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)',\ @@ -23,11 +22,6 @@ Fragment-Host: org.openhab.core 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)',\ @@ -65,4 +59,10 @@ Fragment-Host: org.openhab.core 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.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index a00418f2e..b7680187c 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.core.thing -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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.core.thing org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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)',\ @@ -74,4 +68,10 @@ Fragment-Host: org.openhab.core.thing 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.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index ce8118347..183f37227 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -15,7 +15,6 @@ Fragment-Host: org.openhab.core.voice -runbundles: \ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ 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,12 +27,6 @@ Fragment-Host: org.openhab.core.voice org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ xstream;version='[1.4.20,1.4.21)',\ - 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.openhab.core;version='[4.1.0,4.1.1)',\ org.openhab.core.audio;version='[4.1.0,4.1.1)',\ org.openhab.core.config.core;version='[4.1.0,4.1.1)',\ @@ -79,4 +72,11 @@ Fragment-Host: org.openhab.core.voice 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)'