Upgrade to Karaf 4.3.2 (#10693)

* Syncs the karaf.version so the new Maven plugin is used
* Resolves itest runbundles for the new runtime dependencies

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 57f0c618010a233665757361a6d9a8e9220f89a4..b251e955ead6bfb2fefb2c0f53059eab1acc63df 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -37,9 +37,7 @@ Fragment-Host: org.openhab.binding.astro
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -51,4 +49,6 @@ Fragment-Host: org.openhab.binding.astro
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index fa18b3c7366e13298f92658b9f7311e5a2bdb819..75d652f9652d6b98470ef501b6724f1c21d4ff5c 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -44,25 +44,9 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
-       org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
-       org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
        org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
@@ -75,4 +59,20 @@ Fragment-Host: org.openhab.binding.avmfritz
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
+       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
+       org.eclipse.jetty.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.api;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.common;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
+       org.ops4j.pax.web.pax-web-api;version='[7.3.16,7.3.17)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 57c4ad56bc58d190731f3bfff2234f9a5f43ade6..a3dd97a6f42a0fede0421f4600edcabbcbd543e2 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -47,25 +47,9 @@ Fragment-Host: org.openhab.binding.feed
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.xml;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
-       org.ops4j.pax.web.pax-web-jetty;version='[7.3.13,7.3.14)',\
-       org.ops4j.pax.web.pax-web-runtime;version='[7.3.13,7.3.14)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
-       org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
-       org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
        org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
@@ -77,4 +61,20 @@ Fragment-Host: org.openhab.binding.feed
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
+       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.xml;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
+       org.ops4j.pax.web.pax-web-api;version='[7.3.16,7.3.17)',\
+       org.ops4j.pax.web.pax-web-jetty;version='[7.3.16,7.3.17)',\
+       org.ops4j.pax.web.pax-web-runtime;version='[7.3.16,7.3.17)',\
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.16,7.3.17)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 7cc750ff2572852359b512ee73d8c8eb87844b01..1b54622aeadd715366c9e9ff1c7b291653fb7a36 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -48,25 +48,9 @@ Fragment-Host: org.openhab.binding.hue
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
-       org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
-       org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
        org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
@@ -79,4 +63,20 @@ Fragment-Host: org.openhab.binding.hue
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
+       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
+       org.eclipse.jetty.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.api;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.common;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
+       org.ops4j.pax.web.pax-web-api;version='[7.3.16,7.3.17)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 73f7244c4051beedc64d893387a0ba8a214e70e7..7bb46caab35f8f81114ca420afec72cb6a87c75c 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -45,16 +45,7 @@ Fragment-Host: org.openhab.binding.max
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -66,4 +57,13 @@ Fragment-Host: org.openhab.binding.max
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       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.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 03f672551bbe3922edc5a91bd77f415dfb0b223c..9fc8b32de37cf1c834f73b4caeb7242d08c15191 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -54,16 +54,7 @@ Fragment-Host: org.openhab.binding.modbus
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -75,4 +66,13 @@ Fragment-Host: org.openhab.binding.modbus
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       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.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index ba3a0469bf63d652464406e1217b6dabd98b2258..78da6cd0c7156b3556f8533174c331d445872712 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -53,27 +53,8 @@ Fragment-Host: org.openhab.binding.nest
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.aries.javax.jax.rs-api;version='[1.0.1,1.0.2)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.xml;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
-       org.ops4j.pax.web.pax-web-jetty;version='[7.3.13,7.3.14)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.13,7.3.14)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
-       org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
-       org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
        org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
@@ -103,4 +84,23 @@ Fragment-Host: org.openhab.binding.nest
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
+       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
+       org.eclipse.jetty.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.api;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.common;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.xml;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
+       org.ops4j.pax.web.pax-web-api;version='[7.3.16,7.3.17)',\
+       org.ops4j.pax.web.pax-web-jetty;version='[7.3.16,7.3.17)',\
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.16,7.3.17)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index ef0cfa67a026e0faf16f8eb87a59f2ed5d92e242..0e09279bfa518a0f34fa1fc2fec257a8255fb776 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -49,16 +49,7 @@ Fragment-Host: org.openhab.binding.ntp
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -70,4 +61,13 @@ Fragment-Host: org.openhab.binding.ntp
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       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.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 27db11a0951b1e4f6161612796cb87086d5497aa..284b7858a262b580283d30682cb1e8b29813adcf 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -53,16 +53,7 @@ Fragment-Host: org.openhab.binding.systeminfo
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -74,4 +65,13 @@ Fragment-Host: org.openhab.binding.systeminfo
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       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.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index eff86be11c41d7d2c1e5f799c0c7d2e9b393f96e..2fb17279b1f4658be2e0c80debb1f1d31542a35f 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -55,16 +55,7 @@ Fragment-Host: org.openhab.binding.tradfri
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -76,4 +67,13 @@ Fragment-Host: org.openhab.binding.tradfri
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       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.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 6493726d4f4b2dadbf37a5ee10e661aa4de147b0..dfe9fc21d9e6b7019b132a6d58e1d6d8e04885e9 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -52,25 +52,9 @@ Fragment-Host: org.openhab.binding.wemo
        org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
-       org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.3.13,7.3.14)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
-       org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
-       org.apache.xbean.finder;version='[4.18.0,4.18.1)',\
        org.objectweb.asm;version='[9.1.0,9.1.1)',\
        org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
        org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
@@ -83,4 +67,20 @@ Fragment-Host: org.openhab.binding.wemo
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+       org.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
+       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
+       org.eclipse.jetty.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.api;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.client;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.websocket.common;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)',\
+       org.ops4j.pax.web.pax-web-api;version='[7.3.16,7.3.17)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 777357760fabe509ddfbe345a034ae38f864cdc6..6bed9d1c81ed5118fce57ed4f2d6a8e92e052b68 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -39,14 +39,6 @@ Fragment-Host: org.openhab.persistence.mapdb
        biz.aQute.tester.junit-platform;version='[5.3.0,5.3.1)',\
        com.google.gson;version='[2.8.6,2.8.7)',\
        org.apache.felix.scr;version='[2.1.26,2.1.27)',\
-       org.eclipse.jetty.http;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.io;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.security;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.server;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.servlet;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util;version='[9.4.38,9.4.39)',\
-       org.eclipse.jetty.util.ajax;version='[9.4.38,9.4.39)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.8,2.0.9)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
        org.osgi.util.promise;version='[1.1.1,1.1.2)',\
        jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@@ -57,4 +49,12 @@ Fragment-Host: org.openhab.persistence.mapdb
        si-units;version='[2.0.1,2.0.2)',\
        si.uom.si-quantity;version='[2.0.1,2.0.2)',\
        tech.units.indriya;version='[2.1.2,2.1.3)',\
-       uom-lib-common;version='[2.1.0,2.1.1)'
+       uom-lib-common;version='[2.1.0,2.1.1)',\
+       org.eclipse.jetty.http;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.io;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.security;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.server;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.servlet;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util;version='[9.4.40,9.4.41)',\
+       org.eclipse.jetty.util.ajax;version='[9.4.40,9.4.41)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.9,2.0.10)'

diff --git a/pom.xml b/pom.xml
index 5aa37fd584de6579b0ec7c3719b4c8e56ee633b8..22e7b53779f8d928967f9153c84bc5a2087b0c48 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.12.3</jackson.version>
-    <karaf.version>4.3.1</karaf.version>
+    <karaf.version>4.3.2</karaf.version>
     <netty.version>4.1.63.Final</netty.version>
     <sat.version>0.11.1</sat.version>
     <spotless.version>2.0.3</spotless.version>