diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index d125bc5a4..e9f3aea00 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -19,8 +19,8 @@ 3.4.5 2.12.5 9.4.43.v20210629 - 2.0.10 - 7.3.19 + 2.0.12 + 7.3.23 2.1.9 @@ -57,7 +57,7 @@ org.apache.felix org.apache.felix.scr - 2.1.28 + 2.1.30 compile @@ -232,7 +232,7 @@ org.osgi org.osgi.util.function - 1.1.0 + 1.2.0 compile @@ -240,7 +240,7 @@ org.osgi org.osgi.util.promise - 1.1.1 + 1.2.0 compile @@ -284,7 +284,7 @@ org.apache.felix org.apache.felix.configurator - 1.0.6 + 1.0.14 compile diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 5247da8ce..c4fad7924 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -36,7 +34,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.io.net;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -48,7 +45,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -60,4 +56,8 @@ Fragment-Host: org.openhab.core.auth.oauth2client net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index cdc723399..060c2cc32 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -22,8 +22,6 @@ Fragment-Host: org.openhab.core.automation org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -38,7 +36,6 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -46,7 +43,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -54,4 +50,8 @@ Fragment-Host: org.openhab.core.automation junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 0230de3d6..23b863c0d 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -23,8 +23,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -39,7 +37,6 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -55,4 +51,8 @@ Fragment-Host: org.openhab.core.automation junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 714b5804e..538b8ba1b 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -22,8 +22,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -39,7 +37,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -55,4 +51,8 @@ Fragment-Host: org.openhab.core.automation.module.script junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 d9491ea28..991ba1353 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -23,8 +23,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -39,7 +37,6 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -55,4 +51,8 @@ Fragment-Host: org.openhab.core.automation junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 856448020..8442f8416 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -23,8 +23,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -39,7 +37,6 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.core.automation org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -55,4 +51,8 @@ Fragment-Host: org.openhab.core.automation junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun index 3ab2bf3a1..00ac5d438 100644 --- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun @@ -25,8 +25,6 @@ Fragment-Host: org.openhab.core.binding.xml 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -41,7 +39,6 @@ Fragment-Host: org.openhab.core.binding.xml org.openhab.core.config.core;version='[3.2.0,3.2.1)',\ org.openhab.core.config.xml;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -49,7 +46,6 @@ Fragment-Host: org.openhab.core.binding.xml org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -57,4 +53,8 @@ Fragment-Host: org.openhab.core.binding.xml junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 618c221e7..5d809b276 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -21,8 +21,6 @@ Fragment-Host: org.openhab.core.config.core 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -33,7 +31,6 @@ Fragment-Host: org.openhab.core.config.core org.openhab.core.config.core;version='[3.2.0,3.2.1)',\ org.openhab.core.config.core.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -41,7 +38,6 @@ Fragment-Host: org.openhab.core.config.core org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -53,4 +49,8 @@ Fragment-Host: org.openhab.core.config.core net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 0e1d2d1c9..63b227430 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -21,8 +21,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns javax.jmdns;version='[3.5.7,3.5.8)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -40,7 +38,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.openhab.core.io.transport.mdns;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -48,7 +45,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -56,4 +52,8 @@ Fragment-Host: org.openhab.core.config.discovery.mdns junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 726dbae98..0e09d39eb 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -22,8 +22,6 @@ Fragment-Host: org.openhab.core.config.discovery 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -42,7 +40,6 @@ Fragment-Host: org.openhab.core.config.discovery org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.thing.xml;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -50,7 +47,6 @@ Fragment-Host: org.openhab.core.config.discovery org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -63,4 +59,8 @@ Fragment-Host: org.openhab.core.config.discovery org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 8b393cfba..d43d009bb 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -39,7 +37,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -60,4 +56,8 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 7d3a27109..3ddb93611 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -30,8 +30,6 @@ Provide-Capability: \ 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -48,7 +46,6 @@ Provide-Capability: \ org.openhab.core.io.console;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -56,7 +53,6 @@ Provide-Capability: \ org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -68,4 +64,8 @@ Provide-Capability: \ net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index ed30d9a5d..4ca40dba5 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.config.dispatch 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -34,7 +32,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.openhab.core.config.dispatch;version='[3.2.0,3.2.1)',\ org.openhab.core.config.dispatch.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -42,7 +39,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -50,4 +46,8 @@ Fragment-Host: org.openhab.core.config.dispatch junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun index e5d0b670f..c68e9cbf4 100644 --- a/itests/org.openhab.core.config.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.config.xml 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -34,7 +32,6 @@ Fragment-Host: org.openhab.core.config.xml org.openhab.core.config.xml;version='[3.2.0,3.2.1)',\ org.openhab.core.config.xml.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -42,7 +39,6 @@ Fragment-Host: org.openhab.core.config.xml org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -50,4 +46,8 @@ Fragment-Host: org.openhab.core.config.xml junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 06bdb26bd..c35b5e8e1 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -28,8 +28,6 @@ feature.openhab-config: \ org.threeten.extra;version='[1.5.0,1.5.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -43,7 +41,6 @@ feature.openhab-config: \ org.openhab.core.ephemeris;version='[3.2.0,3.2.1)',\ org.openhab.core.ephemeris.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -51,7 +48,6 @@ feature.openhab-config: \ org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -59,4 +55,8 @@ feature.openhab-config: \ junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.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 9f48ea32a..143a16fa4 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -19,7 +19,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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.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)',\ @@ -28,7 +27,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ org.objectweb.asm;version='[9.1.0,9.1.1)',\ org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\ org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\ @@ -61,7 +59,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -70,10 +67,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ com.fasterxml.woodstox.woodstox-core;version='[6.2.6,6.2.7)',\ org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.5,3.4.6)',\ @@ -94,4 +87,11 @@ Fragment-Host: org.openhab.core.io.rest.core org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ - org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)' + org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index bdbd8a086..7b0908d2f 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -31,8 +31,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ @@ -77,7 +75,6 @@ Fragment-Host: org.openhab.core.model.core org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -90,11 +87,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -108,4 +100,11 @@ Fragment-Host: org.openhab.core.model.core org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ - org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)' + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 69d2dd73a..dc103eb33 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -33,8 +33,6 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ @@ -80,7 +78,6 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -93,11 +90,6 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -106,4 +98,11 @@ Fragment-Host: org.openhab.core.model.item junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ - org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)' + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index b0b785d8b..38ed8380d 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -35,8 +35,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ @@ -82,7 +80,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -95,11 +92,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -108,5 +100,12 @@ Fragment-Host: org.openhab.core.model.rule.runtime junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ - org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)' + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' -runblacklist: bnd.identity;id='jakarta.activation-api' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 421989592..360dc5124 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -36,8 +36,6 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ @@ -82,7 +80,6 @@ Fragment-Host: org.openhab.core.model.script org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -95,11 +92,6 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -108,4 +100,11 @@ Fragment-Host: org.openhab.core.model.script junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ - org.openhab.core.model.thing.runtime;version='[3.2.0,3.2.1)' + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 07e1a54de..d2cd98652 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -35,8 +35,6 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ com.google.guava;version='[30.1.0,30.1.1)',\ org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\ org.eclipse.xtend.lib;version='[2.25.0,2.25.1)',\ @@ -87,7 +85,6 @@ Fragment-Host: org.openhab.core.model.thing org.openhab.core.thing.xml;version='[3.2.0,3.2.1)',\ org.openhab.core.transform;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ @@ -100,11 +97,6 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -118,4 +110,12 @@ Fragment-Host: org.openhab.core.model.thing org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 52583e8d4..cfceb7214 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core.storage.json 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -33,7 +31,6 @@ Fragment-Host: org.openhab.core.storage.json org.openhab.core.storage.json;version='[3.2.0,3.2.1)',\ org.openhab.core.storage.json.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -41,7 +38,6 @@ Fragment-Host: org.openhab.core.storage.json org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -49,4 +45,8 @@ Fragment-Host: org.openhab.core.storage.json junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 01d8dbc1f..12b028bc2 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -20,8 +20,6 @@ Fragment-Host: org.openhab.core 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -31,7 +29,6 @@ Fragment-Host: org.openhab.core org.openhab.core;version='[3.2.0,3.2.1)',\ org.openhab.core.test;version='[3.2.0,3.2.1)',\ org.openhab.core.tests;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -39,7 +36,6 @@ Fragment-Host: org.openhab.core org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -52,4 +48,8 @@ Fragment-Host: org.openhab.core org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 8c57528ae..9c2a714b4 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -26,8 +26,6 @@ Fragment-Host: org.openhab.core.thing 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -44,7 +42,6 @@ Fragment-Host: org.openhab.core.thing org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.thing.tests;version='[3.2.0,3.2.1)',\ org.openhab.core.thing.xml;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -52,7 +49,6 @@ Fragment-Host: org.openhab.core.thing org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -65,4 +61,8 @@ Fragment-Host: org.openhab.core.thing org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun index 77f5aaca2..525d6e125 100644 --- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun @@ -22,8 +22,6 @@ Fragment-Host: org.openhab.core.thing.xml 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ jakarta.annotation-api;version='[2.0.0,2.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ javax.measure.unit-api;version='[2.1.2,2.1.3)',\ @@ -40,7 +38,6 @@ Fragment-Host: org.openhab.core.thing.xml org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.thing.xml;version='[3.2.0,3.2.1)',\ org.openhab.core.thing.xml.tests;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -48,7 +45,6 @@ Fragment-Host: org.openhab.core.thing.xml org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -56,4 +52,8 @@ Fragment-Host: org.openhab.core.thing.xml junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index cbd35216c..fba4e25bf 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -24,8 +24,6 @@ Fragment-Host: org.openhab.core.voice 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)',\ com.google.gson;version='[2.8.6,2.8.7)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.1,1.1.2)',\ org.objectweb.asm;version='[9.1.0,9.1.1)',\ org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\ org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\ @@ -47,7 +45,6 @@ Fragment-Host: org.openhab.core.voice org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.openhab.core.voice;version='[3.2.0,3.2.1)',\ org.openhab.core.voice.tests;version='[3.2.0,3.2.1)',\ - org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ @@ -56,11 +53,6 @@ Fragment-Host: org.openhab.core.voice org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -69,4 +61,12 @@ Fragment-Host: org.openhab.core.voice junit-platform-commons;version='[1.8.1,1.8.2)',\ junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ - biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)' + biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\ + org.apache.felix.scr;version='[2.1.30,2.1.31)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.2.0,1.2.1)' diff --git a/pom.xml b/pom.xml index 5f93928c9..e1d5ad7d3 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 3.7.2 2.3.0 4.3.0 - 4.3.3 + 4.3.4 0.12.0 1.7.32 2.25.0