From 4ab0f83e839b84a324eef15b86fa1e6caff7e9e9 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 28 Apr 2022 22:00:16 +0200 Subject: [PATCH] Upgrade to Karaf 4.3.7 (#2934) * Syncs dependencies with Karaf 4.3.7 * Resolves itest runbundles for these new dependencies Signed-off-by: Wouter Born --- bom/compile/pom.xml | 2 +- bom/runtime/pom.xml | 16 +++---- features/karaf/openhab-core/pom.xml | 4 +- features/karaf/openhab-tp/pom.xml | 2 +- .../itest.bndrun | 28 ++++++------- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 20 ++++----- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 18 ++++---- .../itest.bndrun | 32 +++++++------- .../itest.bndrun | 40 +++++++++--------- .../itest.bndrun | 39 +++++++++-------- .../itest.bndrun | 40 +++++++++--------- .../itest.bndrun | 42 +++++++++---------- .../itest.bndrun | 39 +++++++++-------- .../itest.bndrun | 18 ++++---- itests/org.openhab.core.tests/itest.bndrun | 18 ++++---- .../org.openhab.core.thing.tests/itest.bndrun | 20 ++++----- .../itest.bndrun | 18 ++++---- .../org.openhab.core.voice.tests/itest.bndrun | 34 +++++++-------- pom.xml | 2 +- 31 files changed, 328 insertions(+), 330 deletions(-) diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index fd9bc71f9..8daa1ec93 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -17,7 +17,7 @@ The dependencies that are used to compile the core bundles - 9.4.43.v20210629 + 9.4.46.v20220331 2.1.9 diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 525db474d..f541574b6 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -19,9 +19,9 @@ 3.4.5 2.12.6 - 9.4.43.v20210629 - 2.0.14 - 7.3.23 + 9.4.46.v20220331 + 2.0.16 + 7.3.25 2.1.9 @@ -72,7 +72,7 @@ org.apache.felix org.apache.felix.configadmin - 1.9.22 + 1.9.24 compile @@ -325,7 +325,7 @@ org.apache.felix org.apache.felix.webconsole - 4.7.0 + 4.7.2 org.apache.felix @@ -347,7 +347,7 @@ org.apache.felix org.apache.felix.gogo.runtime - 1.1.4 + 1.1.6 org.apache.felix @@ -731,13 +731,13 @@ org.apache.xbean xbean-bundleutils - 4.20 + 4.21 compile org.apache.xbean xbean-finder - 4.20 + 4.21 compile diff --git a/features/karaf/openhab-core/pom.xml b/features/karaf/openhab-core/pom.xml index b504e157d..16ad58a99 100644 --- a/features/karaf/openhab-core/pom.xml +++ b/features/karaf/openhab-core/pom.xml @@ -16,8 +16,8 @@ openHAB Core Features - 9.4.43.v20210629 - 5.9.0 + 9.4.46.v20220331 + 5.11.0 diff --git a/features/karaf/openhab-tp/pom.xml b/features/karaf/openhab-tp/pom.xml index e25f84527..ec29bad89 100644 --- a/features/karaf/openhab-tp/pom.xml +++ b/features/karaf/openhab-tp/pom.xml @@ -15,7 +15,7 @@ openHAB Core :: Features :: Karaf :: Target Platform - 9.4.43.v20210629 + 9.4.46.v20220331 diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 745f55653..c22eb5de0 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -26,18 +26,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -58,6 +46,18 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.io.net;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index e2b3a0727..afb9da3e1 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -52,6 +45,13 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 83102893c..9dc08fe8b 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -52,6 +45,13 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 0f0dc5ab7..141796b41 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.automation.module.script org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -53,7 +46,14 @@ Fragment-Host: org.openhab.core.automation.module.script org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.transform;version='[3.3.0,3.3.1)' + org.openhab.core.transform;version='[3.3.0,3.3.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 a671efaa5..56cb05d51 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -52,6 +45,13 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 78b909be0..444fd0652 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -52,6 +45,13 @@ Fragment-Host: org.openhab.core.automation org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun index f4b833507..3c09bf3a2 100644 --- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun @@ -29,14 +29,6 @@ Fragment-Host: org.openhab.core.binding.xml org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -53,7 +45,15 @@ Fragment-Host: org.openhab.core.binding.xml org.openhab.core.config.core;version='[3.3.0,3.3.1)',\ org.openhab.core.config.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 2d05e73c4..c96627a81 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -26,13 +26,6 @@ Fragment-Host: org.openhab.core.config.core org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -51,7 +44,14 @@ Fragment-Host: org.openhab.core.config.core org.openhab.core.config.core;version='[3.3.0,3.3.1)',\ org.openhab.core.config.core.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 7845a1fd2..301e6aee3 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -27,14 +27,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -58,6 +50,14 @@ Fragment-Host: org.openhab.core.config.discovery.mdns net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\ org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index b200d6371..19be5e682 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -28,14 +28,6 @@ Fragment-Host: org.openhab.core.config.discovery org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -60,7 +52,15 @@ Fragment-Host: org.openhab.core.config.discovery org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 247188bce..6eaa75e34 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 @@ -26,14 +26,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -58,6 +50,14 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 17d71410d..f4d28e972 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -36,14 +36,6 @@ Provide-Capability: \ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -66,6 +58,14 @@ Provide-Capability: \ org.openhab.core.io.console;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 64e015f61..49df0e3c7 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -26,14 +26,6 @@ Fragment-Host: org.openhab.core.config.dispatch org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -48,6 +40,14 @@ Fragment-Host: org.openhab.core.config.dispatch org.openhab.core.config.dispatch;version='[3.3.0,3.3.1)',\ org.openhab.core.config.dispatch.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun index e35913f82..d32446faa 100644 --- a/itests/org.openhab.core.config.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun @@ -25,13 +25,6 @@ Fragment-Host: org.openhab.core.config.xml org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -47,7 +40,14 @@ Fragment-Host: org.openhab.core.config.xml org.openhab.core.config.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.config.xml.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 7a087ea12..1bc6ffc2a 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -33,13 +33,6 @@ feature.openhab-config: \ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -56,7 +49,14 @@ feature.openhab-config: \ org.openhab.core.ephemeris;version='[3.3.0,3.3.1)',\ org.openhab.core.ephemeris.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' 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 73f646469..86ad9ed2f 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -46,15 +46,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ com.fasterxml.woodstox.woodstox-core;version='[6.2.6,6.2.7)',\ org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.5,3.4.6)',\ @@ -76,9 +67,6 @@ Fragment-Host: org.openhab.core.io.rest.core org.objenesis;version='[3.2.0,3.2.1)',\ org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -92,9 +80,21 @@ Fragment-Host: org.openhab.core.io.rest.core org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index 3add8cc26..6597c3cc4 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -34,13 +34,6 @@ Fragment-Host: org.openhab.core.model.core org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -61,7 +54,6 @@ Fragment-Host: org.openhab.core.model.core org.openhab.core.model.core.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.model.sitemap;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ com.google.inject;version='[5.0.1,5.0.2)',\ org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\ @@ -71,13 +63,6 @@ Fragment-Host: org.openhab.core.model.core org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\ io.github.classgraph;version='[4.8.138,4.8.139)',\ jollyday;version='[0.5.10,0.5.11)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\ org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ @@ -102,10 +87,25 @@ Fragment-Host: org.openhab.core.model.core org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.threeten.extra;version='[1.5.0,1.5.1)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.model.sitemap.runtime;version='[3.3.0,3.3.1)' + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index fe90295fe..4b13a87f9 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -40,18 +40,6 @@ Fragment-Host: org.openhab.core.model.item org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -60,10 +48,6 @@ Fragment-Host: org.openhab.core.model.item junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -91,9 +75,6 @@ Fragment-Host: org.openhab.core.model.item org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ com.google.inject;version='[5.0.1,5.0.2)',\ io.github.classgraph;version='[4.8.138,4.8.139)',\ @@ -106,4 +87,22 @@ Fragment-Host: org.openhab.core.model.item org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.model.sitemap.runtime;version='[3.3.0,3.3.1)' + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index f4d156f44..f8ca858f7 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -41,18 +41,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -61,10 +49,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -92,9 +76,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ com.google.inject;version='[5.0.1,5.0.2)',\ io.github.classgraph;version='[4.8.138,4.8.139)',\ @@ -107,5 +88,24 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.model.sitemap.runtime;version='[3.3.0,3.3.1)' + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' -runblacklist: bnd.identity;id='jakarta.activation-api' diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 5eb2a0a0c..60716ee79 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -42,19 +42,6 @@ Fragment-Host: org.openhab.core.model.script javax.measure.unit-api;version='[2.1.2,2.1.3)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -63,10 +50,6 @@ Fragment-Host: org.openhab.core.model.script junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -93,9 +76,6 @@ Fragment-Host: org.openhab.core.model.script org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ com.google.inject;version='[5.0.1,5.0.2)',\ io.github.classgraph;version='[4.8.138,4.8.139)',\ @@ -108,4 +88,24 @@ Fragment-Host: org.openhab.core.model.script org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.model.sitemap.runtime;version='[3.3.0,3.3.1)' + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.openhab.core.model.item.runtime;version='[3.3.0,3.3.1)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 31cf5626b..55486f5c1 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -42,18 +42,6 @@ Fragment-Host: org.openhab.core.model.thing org.osgi.service.cm;version='[1.6.0,1.6.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.api;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.client;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -68,10 +56,6 @@ Fragment-Host: org.openhab.core.model.thing org.mockito.mockito-core;version='[4.1.0,4.1.1)',\ org.objenesis;version='[3.2.0,3.2.1)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -103,9 +87,6 @@ Fragment-Host: org.openhab.core.model.thing org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.transform;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ com.google.inject;version='[5.0.1,5.0.2)',\ @@ -119,4 +100,22 @@ Fragment-Host: org.openhab.core.model.thing org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ - org.openhab.core.model.sitemap.runtime;version='[3.3.0,3.3.1)' + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.api;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.client;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index 15d46bf0e..2b08984b1 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -25,13 +25,6 @@ Fragment-Host: org.openhab.core.storage.json org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -47,6 +40,13 @@ Fragment-Host: org.openhab.core.storage.json org.openhab.core.storage.json;version='[3.3.0,3.3.1)',\ org.openhab.core.storage.json.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index b89474678..e1d307fbe 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -25,13 +25,6 @@ Fragment-Host: org.openhab.core org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -50,6 +43,13 @@ Fragment-Host: org.openhab.core org.openhab.core;version='[3.3.0,3.3.1)',\ org.openhab.core.test;version='[3.3.0,3.3.1)',\ org.openhab.core.tests;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 5ab8d6be5..f3c531607 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -31,14 +31,6 @@ Fragment-Host: org.openhab.core.thing org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -62,7 +54,15 @@ Fragment-Host: org.openhab.core.thing org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.tests;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun index 2b695819e..19b9721c1 100644 --- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun @@ -27,13 +27,6 @@ Fragment-Host: org.openhab.core.thing.xml org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -53,7 +46,14 @@ Fragment-Host: org.openhab.core.thing.xml org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml;version='[3.3.0,3.3.1)',\ org.openhab.core.thing.xml.tests;version='[3.3.0,3.3.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ xstream;version='[1.4.19,1.4.20)',\ com.google.gson;version='[2.8.9,2.8.10)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index 1af5bdc42..0bdf43b0c 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -31,15 +31,6 @@ Fragment-Host: org.openhab.core.voice org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ - org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ - org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.security;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.server;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.servlet;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ - org.eclipse.jetty.xml;version='[9.4.43,9.4.44)',\ si-units;version='[2.1.0,2.1.1)',\ si.uom.si-quantity;version='[2.1.0,2.1.1)',\ junit-jupiter-api;version='[5.8.1,5.8.2)',\ @@ -49,10 +40,6 @@ Fragment-Host: org.openhab.core.voice junit-platform-engine;version='[1.8.1,1.8.2)',\ junit-platform-launcher;version='[1.8.1,1.8.2)',\ org.apache.felix.scr;version='[2.1.30,2.1.31)',\ - org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\ - org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.2.0,1.2.1)',\ org.openhab.core;version='[3.3.0,3.3.1)',\ @@ -64,9 +51,22 @@ Fragment-Host: org.openhab.core.voice org.openhab.core.thing;version='[3.3.0,3.3.1)',\ org.openhab.core.voice;version='[3.3.0,3.3.1)',\ org.openhab.core.voice.tests;version='[3.3.0,3.3.1)',\ - org.apache.xbean.bundleutils;version='[4.20.0,4.20.1)',\ - org.apache.xbean.finder;version='[4.20.0,4.20.1)',\ - org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)',\ com.google.gson;version='[2.8.9,2.8.10)',\ org.objectweb.asm;version='[9.2.0,9.2.1)',\ - biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)' + biz.aQute.tester.junit-platform;version='[6.2.0,6.2.1)',\ + org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\ + org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\ + org.apache.xbean.finder;version='[4.21.0,4.21.1)',\ + org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.server;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\ + org.eclipse.jetty.xml;version='[9.4.46,9.4.47)',\ + org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\ + org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\ + org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)' diff --git a/pom.xml b/pom.xml index c932a5594..61e3c1a60 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 3.7.2 2.3.0 4.3.0 - 4.3.6 + 4.3.7 0.12.0 1.7.32 2.26.0