diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index bf3272bf0c7..f849b2c12a3 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -18,8 +18,8 @@ 2.7.4 - 9.4.50.v20221201 - 8.0.15 + 9.4.52.v20230823 + 8.0.22 2.2.15 @@ -84,7 +84,7 @@ org.apache.commons commons-lang3 - 3.9 + 3.12.0 compile @@ -428,13 +428,13 @@ net.java.dev.jna jna - 5.12.1 + 5.13.0 compile net.java.dev.jna jna-platform - 5.12.1 + 5.13.0 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index f666399e887..b905ef530e4 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -19,9 +19,9 @@ 2.7.4 3.6.1 2.15.2 - 9.4.50.v20221201 - 2.2.0 - 8.0.15 + 9.4.52.v20230823 + 2.2.3 + 8.0.22 2.2.15 @@ -50,7 +50,7 @@ org.eclipse.platform org.eclipse.osgi - 3.17.200 + 3.18.0 compile @@ -64,7 +64,7 @@ org.apache.felix org.apache.felix.scr - 2.2.4 + 2.2.6 compile @@ -100,13 +100,13 @@ org.eclipse.platform org.eclipse.equinox.event - 1.4.300 + 1.6.200 compile org.osgi org.osgi.service.event - 1.4.0 + 1.4.1 compile @@ -114,13 +114,13 @@ org.osgi org.osgi.service.log - 1.4.0 + 1.5.0 compile org.eclipse.platform org.eclipse.equinox.log.stream - 1.0.100 + 1.1.100 compile @@ -174,7 +174,7 @@ org.apache.aries.spec org.apache.aries.javax.jax.rs-api - 1.0.1 + 1.0.4 compile @@ -188,7 +188,7 @@ com.sun.xml.bind jaxb-osgi - 2.3.3 + 2.3.8 @@ -247,7 +247,7 @@ org.osgi org.osgi.util.promise - 1.2.0 + 1.3.0 compile @@ -263,7 +263,7 @@ org.osgi org.osgi.util.converter - 1.0.0 + 1.0.9 compile @@ -271,19 +271,19 @@ org.apache.aries.tx-control tx-control-service-xa - 1.0.0 + 1.0.1 compile org.apache.aries.tx-control tx-control-provider-jdbc-xa - 1.0.0 + 1.0.1 compile org.apache.aries.tx-control tx-control-provider-jpa-xa - 1.0.0 + 1.0.1 compile @@ -291,7 +291,7 @@ org.apache.felix org.apache.felix.configurator - 1.0.14 + 1.0.16 compile @@ -299,7 +299,7 @@ org.apache.aries.jpa org.apache.aries.jpa.container - 2.7.0 + 2.7.3 compile @@ -312,7 +312,7 @@ org.osgi org.osgi.service.jdbc - 1.0.0 + 1.0.1 compile @@ -331,7 +331,7 @@ org.apache.felix org.apache.felix.webconsole - 4.7.2 + 4.8.12 org.apache.felix @@ -398,7 +398,7 @@ commons-io commons-io - 2.11.0 + 2.13.0 org.apache.commons @@ -775,13 +775,13 @@ org.apache.xbean xbean-bundleutils - 4.22 + 4.23 compile org.apache.xbean xbean-finder - 4.22 + 4.23 compile @@ -1082,13 +1082,13 @@ net.java.dev.jna jna - 5.12.1 + 5.13.0 compile net.java.dev.jna jna-platform - 5.12.1 + 5.13.0 compile diff --git a/bom/test/pom.xml b/bom/test/pom.xml index 5c8aae9071a..f1887cde634 100644 --- a/bom/test/pom.xml +++ b/bom/test/pom.xml @@ -25,7 +25,7 @@ com.sun.xml.bind jaxb-osgi - 2.3.3 + 2.3.8 org.eclipse.jdt @@ -60,7 +60,7 @@ ch.qos.logback logback-classic - 1.2.11 + 1.3.11 com.jayway.jsonpath diff --git a/bundles/org.openhab.core.test/pom.xml b/bundles/org.openhab.core.test/pom.xml index b9de4751368..5044410c21b 100644 --- a/bundles/org.openhab.core.test/pom.xml +++ b/bundles/org.openhab.core.test/pom.xml @@ -35,7 +35,7 @@ ch.qos.logback logback-classic - 1.2.11 + 1.3.11 compile diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml index d2fa72344f7..625d7bd0cb2 100644 --- a/features/karaf/openhab-core/pom.xml +++ b/features/karaf/openhab-core/pom.xml @@ -16,8 +16,8 @@ openHAB Core Features - 9.4.50.v20221201 - 5.12.1 + 9.4.52.v20230823 + 5.13.0 diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index db4323d1c1b..9cd839b2cbf 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -47,15 +47,13 @@ mvn:org.openhab.core.bundles/org.openhab.core.config.dispatch/${project.version} mvn:org.openhab.core.bundles/org.openhab.core/${project.version} mvn:org.openhab.osgiify/io.methvin.directory-watcher/0.18.0 - mvn:net.java.dev.jna/jna/5.12.1 - mvn:net.java.dev.jna/jna-platform/5.12.1 openhab-core-storage-json mvn:org.openhab.core.bundles/org.openhab.core.addon/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.ephemeris/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.id/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.persistence/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.semantics/${project.version} - openhab.tp-asm + asm mvn:org.openhab.core.bundles/org.openhab.core.thing/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.transform/${project.version} mvn:org.openhab.core.bundles/org.openhab.core.audio/${project.version} @@ -183,9 +181,7 @@ openhab-core-base openhab-core-io-rest-auth - - mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version} + pax-web-jetty-websockets mvn:org.openhab.core.bundles/org.openhab.core.io.websocket/${project.version} @@ -445,16 +441,9 @@ openhab.tp;feature=httpclient;version=${jetty.version} - openhab-core-auth-oauth2client - mvn:javax.servlet/javax.servlet-api/3.1.0 - mvn:org.eclipse.jetty/jetty-client/${jetty.version} - mvn:org.eclipse.jetty/jetty-http/${jetty.version} - mvn:org.eclipse.jetty/jetty-util/${jetty.version} - mvn:org.eclipse.jetty/jetty-io/${jetty.version} - mvn:org.eclipse.jetty/jetty-proxy/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version} + openhab-core-auth-oauth2client + pax-web-jetty-extras + pax-web-jetty-websockets diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml index 50f976515c8..9479bb61a88 100644 --- a/features/karaf/openhab-tp/pom.xml +++ b/features/karaf/openhab-tp/pom.xml @@ -15,8 +15,8 @@ openHAB Core :: Features :: Karaf :: Target Platform - 9.4.50.v20221201 - 5.12.1 + 9.4.52.v20230823 + 5.13.0 diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 0c2401c795e..6b0d43da969 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -72,20 +72,10 @@ openhab.tp;feature=httpclient;version=${jetty.version} + pax-web-jetty-extras pax-web-jetty-http2 - pax-web-jetty-http2-jdk9 - mvn:javax.servlet/javax.servlet-api/3.1.0 - mvn:org.eclipse.jetty/jetty-alpn-client/${jetty.version} - mvn:org.eclipse.jetty/jetty-alpn-java-client/${jetty.version} - mvn:org.eclipse.jetty/jetty-client/${jetty.version} - mvn:org.eclipse.jetty/jetty-http/${jetty.version} - mvn:org.eclipse.jetty/jetty-util/${jetty.version} - mvn:org.eclipse.jetty/jetty-io/${jetty.version} - mvn:org.eclipse.jetty/jetty-proxy/${jetty.version} - mvn:org.eclipse.jetty.http2/http2-client/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version} - mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version} + pax-web-jetty-http2-extras + pax-web-jetty-websockets @@ -103,25 +93,15 @@ mvn:org.yaml/snakeyaml/2.1 - - openhab.tp;feature=asm;version=9.4.0 - mvn:org.ow2.asm/asm/9.4 - mvn:org.ow2.asm/asm-analysis/9.4 - mvn:org.ow2.asm/asm-commons/9.4 - mvn:org.ow2.asm/asm-util/9.4 - mvn:org.ow2.asm/asm-tree/9.4 - - openhab.tp;feature=jax-rs-whiteboard;version=2.0.0 - http-whiteboard - openhab.tp-asm + spifly + http-whiteboard openhab.tp-cxf openhab.tp-jaxb - mvn:org.osgi/org.osgi.util.function/1.1.0 - mvn:org.osgi/org.osgi.util.promise/1.1.1 - mvn:org.osgi/org.osgi.service.jaxrs/1.0.0 - mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6 + mvn:org.osgi/org.osgi.util.function/1.2.0 + mvn:org.osgi/org.osgi.util.promise/1.3.0 + mvn:org.osgi/org.osgi.service.jaxrs/1.0.1 mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/1.2.2 mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0 @@ -176,10 +156,10 @@ - openhab.tp;feature=jaxb;version=2.3.3 + openhab.tp;feature=jaxb;version=2.3.8 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_3 mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3 - mvn:com.sun.xml.bind/jaxb-osgi/2.3.3 + mvn:com.sun.xml.bind/jaxb-osgi/2.3.8 mvn:org.glassfish.hk2/osgi-resource-locator/1.0.3 diff --git a/features/karaf/pom.xml b/features/karaf/pom.xml index e56b9f0868b..93c9e575a3b 100644 --- a/features/karaf/pom.xml +++ b/features/karaf/pom.xml @@ -84,6 +84,7 @@ mvn:org.apache.karaf.features/framework/${karaf.tooling.version}/xml/features mvn:org.apache.karaf.features/standard/${karaf.tooling.version}/xml/features + mvn:org.apache.karaf.features/specs/${karaf.tooling.version}/xml/features file:${project.build.directory}/feature/feature.xml diff --git a/itests/itest-include.bndrun b/itests/itest-include.bndrun index f66b3987571..e2e58b65499 100644 --- a/itests/itest-include.bndrun +++ b/itests/itest-include.bndrun @@ -52,3 +52,6 @@ Export-Package: --add-opens=java.desktop/java.awt.font=ALL-UNNAMED,\ --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED,\ --add-opens=java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED + +-runblacklist.itest-include: \ + bnd.identity;id='slf4j.api' diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index 45665c6365d..94f22d89a20 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -13,12 +13,9 @@ Fragment-Host: org.openhab.core.addon # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -27,23 +24,10 @@ Fragment-Host: org.openhab.core.addon si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -61,4 +45,26 @@ Fragment-Host: org.openhab.core.addon org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 509ec356590..cbe8e4c66f7 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core.auth.oauth2client # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,32 +20,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ 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)',\ @@ -69,4 +45,34 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index 842201341fd..24c2da2b17c 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -10,11 +10,8 @@ Fragment-Host: org.openhab.core.automation # -runbundles: \ 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.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,23 +22,10 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.automation org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 ce3c205dde4..4e1b52ffb00 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -10,11 +10,8 @@ Fragment-Host: org.openhab.core.automation # -runbundles: \ 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.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,23 +22,10 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.automation org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 261af8ee66e..1aeddd4a618 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -10,11 +10,8 @@ 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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,23 +22,10 @@ Fragment-Host: org.openhab.core.automation.module.script si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -64,4 +48,26 @@ Fragment-Host: org.openhab.core.automation.module.script org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 428caececf4..e11bb2f194a 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core.automation # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,23 +22,10 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.automation org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 1215cf2eccb..9659fd5022d 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -10,11 +10,8 @@ Fragment-Host: org.openhab.core.automation # -runbundles: \ 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.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,23 +22,10 @@ Fragment-Host: org.openhab.core.automation si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.automation org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 33513cc4ead..bd13b2510fa 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -10,12 +10,9 @@ Fragment-Host: org.openhab.core.config.core # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +21,10 @@ Fragment-Host: org.openhab.core.config.core si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -62,4 +46,26 @@ Fragment-Host: org.openhab.core.config.core org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 ba9440afbbd..f98535a2a3e 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core.config.discovery.mdns # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,24 +20,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ javax.jmdns;version='[3.5.8,3.5.9)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index d25a754a0d9..bcfb5f7a2d7 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -10,12 +10,9 @@ Fragment-Host: org.openhab.core.config.discovery # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +21,10 @@ Fragment-Host: org.openhab.core.config.discovery si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -66,4 +50,26 @@ Fragment-Host: org.openhab.core.config.discovery org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 a2eb4d598b2..ac8c6634c34 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 @@ -10,11 +10,8 @@ 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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +20,10 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -67,4 +51,26 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 3d7e861065d..37e444c1541 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -20,11 +20,8 @@ Provide-Capability: \ # -runbundles: \ 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.event;version='[1.4.0,1.4.1)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\ @@ -33,23 +30,10 @@ Provide-Capability: \ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -75,4 +59,26 @@ Provide-Capability: \ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 09eb0be8f3d..722d6db159d 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core.config.dispatch # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +20,10 @@ Fragment-Host: org.openhab.core.config.dispatch si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -55,4 +39,26 @@ Fragment-Host: org.openhab.core.config.dispatch org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index d8bd4c1bec0..a24f20f88e2 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -14,12 +14,9 @@ feature.openhab-config: \ # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -30,23 +27,10 @@ feature.openhab-config: \ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -64,4 +48,26 @@ feature.openhab-config: \ org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 8485cb15bf5..42789b0c4cc 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -11,11 +11,7 @@ Fragment-Host: org.openhab.core.io.net -runbundles: \ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -25,39 +21,16 @@ Fragment-Host: org.openhab.core.io.net 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.felix.scr;version='[2.2.4,2.2.5)',\ org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ 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.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ 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.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http2.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.server;version='[9.4.50,9.4.51)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ @@ -73,4 +46,31 @@ Fragment-Host: org.openhab.core.io.net org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.servlet;version='[9.4.52,9.4.53)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' 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 2671c447356..cdbdda5ede2 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -13,17 +13,13 @@ Fragment-Host: org.openhab.core.io.rest.core # done # -runbundles: \ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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.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)',\ - com.sun.xml.bind.jaxb-osgi;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)',\ - org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\ org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ stax2-api;version='[4.2.1,4.2.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\ @@ -32,31 +28,11 @@ Fragment-Host: org.openhab.core.io.rest.core si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ 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)',\ @@ -104,4 +80,28 @@ Fragment-Host: org.openhab.core.io.rest.core json-path;version='[2.8.0,2.8.1)',\ net.minidev.accessors-smart;version='[2.4.9,2.4.10)',\ net.minidev.json-smart;version='[2.4.10,2.4.11)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;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 8b5ee77cb83..6ea19f1c247 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -14,13 +14,10 @@ Fragment-Host: org.openhab.core.model.item org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -34,10 +31,7 @@ Fragment-Host: org.openhab.core.model.item si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ com.google.inject;version='[5.0.1,5.0.2)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ @@ -50,33 +44,8 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ - org.apache.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ 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)',\ @@ -114,4 +83,40 @@ Fragment-Host: org.openhab.core.model.item tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;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 1ded91e0de5..f467334c6e6 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -17,14 +17,11 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -38,10 +35,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ com.google.inject;version='[5.0.1,5.0.2)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ @@ -54,34 +48,9 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ 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)',\ @@ -118,4 +87,40 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;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 b3f68a8e50d..a7ac5da32d1 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -17,13 +17,10 @@ Fragment-Host: org.openhab.core.model.script org.antlr.runtime;version='[3.2.0,3.2.1)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,10 +34,7 @@ Fragment-Host: org.openhab.core.model.script si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ com.google.inject;version='[5.0.1,5.0.2)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ @@ -53,34 +47,9 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ 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)',\ @@ -122,4 +91,39 @@ Fragment-Host: org.openhab.core.model.script tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)' + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;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 b5df5c10058..9cd68607916 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -13,15 +13,12 @@ Fragment-Host: org.openhab.core.model.thing # -runbundles: \ org.antlr.runtime;version='[3.2.0,3.2.1)',\ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -35,10 +32,7 @@ Fragment-Host: org.openhab.core.model.thing si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ com.google.inject;version='[5.0.1,5.0.2)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ io.github.classgraph;version='[4.8.149,4.8.150)',\ @@ -51,33 +45,8 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\ org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\ org.objectweb.asm;version='[9.4.0,9.4.1)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ - org.apache.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.api;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.websocket.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ org.osgi.service.component;version='[1.5.0,1.5.1)',\ - org.eclipse.jetty.alpn.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\ 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)',\ @@ -124,4 +93,39 @@ Fragment-Host: org.openhab.core.model.thing uom-lib-common;version='[2.2.0,2.2.1)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ - org.openhab.core.model.rule.runtime;version='[4.1.0,4.1.1)' + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.alpn.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.http2.hpack;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.api;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.client;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.websocket.common;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;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 a28cd2a895c..a5938e603a3 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core.storage.json # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +20,10 @@ Fragment-Host: org.openhab.core.storage.json si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -60,4 +44,26 @@ Fragment-Host: org.openhab.core.storage.json org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index f7b6ad99c2c..ba95bf1416f 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -9,12 +9,9 @@ Fragment-Host: org.openhab.core # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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,23 +20,10 @@ Fragment-Host: org.openhab.core si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -59,4 +43,26 @@ Fragment-Host: org.openhab.core org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index f20253fa907..048b7521043 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -13,12 +13,9 @@ Fragment-Host: org.openhab.core.thing # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -27,23 +24,10 @@ Fragment-Host: org.openhab.core.thing si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.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)',\ @@ -68,4 +52,26 @@ Fragment-Host: org.openhab.core.thing org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index f8f7ecb0639..0a3408e5c74 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -13,12 +13,9 @@ Fragment-Host: org.openhab.core.voice # done # -runbundles: \ - org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ - org.osgi.service.event;version='[1.4.0,1.4.1)',\ 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)',\ - com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ 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)',\ @@ -27,30 +24,10 @@ Fragment-Host: org.openhab.core.voice si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.2.0,1.2.1)',\ - ch.qos.logback.classic;version='[1.2.11,1.2.12)',\ - ch.qos.logback.core;version='[1.2.11,1.2.12)',\ biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\ com.google.gson;version='[2.9.1,2.9.2)',\ - com.sun.jna;version='[5.12.1,5.12.2)',\ 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.felix.scr;version='[2.2.4,2.2.5)',\ - org.eclipse.jetty.http;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.io;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.jaas;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.security;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.server;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.servlet;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.util.ajax;version='[9.4.50,9.4.51)',\ - org.eclipse.jetty.xml;version='[9.4.50,9.4.51)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.2.0,2.2.1)',\ - org.ops4j.pax.web.pax-web-api;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-jetty;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-runtime;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-spi;version='[8.0.15,8.0.16)',\ - org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.15,8.0.16)',\ 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)',\ @@ -73,4 +50,33 @@ Fragment-Host: org.openhab.core.voice org.apiguardian.api;version='[1.1.2,1.1.3)',\ tech.units.indriya;version='[2.2.0,2.2.1)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ - io.methvin.directory-watcher;version='[0.18.0,0.18.1)' + io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ + ch.qos.logback.classic;version='[1.3.11,1.3.12)',\ + ch.qos.logback.core;version='[1.3.11,1.3.12)',\ + com.sun.jna;version='[5.13.0,5.13.1)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\ + org.apache.aries.spifly.dynamic.bundle;version='[1.3.6,1.3.7)',\ + org.apache.felix.scr;version='[2.2.6,2.2.7)',\ + org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\ + org.eclipse.jetty.http;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.io;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.jaas;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.security;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.server;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.servlet;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.util.ajax;version='[9.4.52,9.4.53)',\ + org.eclipse.jetty.xml;version='[9.4.52,9.4.53)',\ + org.objectweb.asm;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.commons;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.tree.analysis;version='[9.4.0,9.4.1)',\ + org.objectweb.asm.util;version='[9.4.0,9.4.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.2.3,2.2.4)',\ + org.ops4j.pax.web.pax-web-api;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-jetty;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-runtime;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-spi;version='[8.0.22,8.0.23)',\ + org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.22,8.0.23)',\ + org.osgi.service.event;version='[1.4.1,1.4.2)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)' diff --git a/pom.xml b/pom.xml index 48eedd4f2ad..1e91f7fc1bf 100644 --- a/pom.xml +++ b/pom.xml @@ -72,10 +72,10 @@ 6.4.0 3.7.2 2.3.0 - 4.4.3 - 4.4.3 + 4.4.4 + 4.4.4 0.15.0 - 1.7.32 + 2.0.6 2.29.0 2.38.0 diff --git a/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java b/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java index b310d813979..dd8f20c2896 100644 --- a/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java +++ b/tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java @@ -62,7 +62,7 @@ public static void main(String[] args) { System.exit(0); } - System.setProperty(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, loglevel); + System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, loglevel); String baseDir = commandLine.hasOption(OPT_DIR) ? commandLine.getOptionValue(OPT_DIR) : System.getenv("OPENHAB_USERDATA");