Upgrade to Karaf 4.3.6 (#12058)

* 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 c65da9c7426b77d48c5be96ad50bb51f3efeca6f..c654c9624859bb2d11f8d617222c08479b999f94 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -40,7 +40,6 @@ Fragment-Host: org.openhab.binding.astro
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.astro;version='[3.3.0,3.3.1)',\
@@ -50,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.config.discovery;version='[3.3.0,3.3.1)',\
        org.openhab.core.io.console;version='[3.3.0,3.3.1)',\
        org.openhab.core.storage.json;version='[3.3.0,3.3.1)',\
-       org.openhab.core.thing;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)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 0384db04805ac25953999a49362214e5a4b9772b..54a42fdcbe075bf8b0558cef3e1d23c65bf0f5ac 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -36,8 +36,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        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.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.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)',\
@@ -62,7 +60,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -75,4 +72,7 @@ Fragment-Host: org.openhab.binding.avmfritz
        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.openhab.core.thing;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing;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)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 4691916c97c7c8f06db8bf6d2684d421db8ef664..d7d3d91aa587a559b7020978eafe9d0ec2d50bb6 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -39,8 +39,6 @@ Fragment-Host: org.openhab.binding.feed
        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.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
-       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
        xstream;version='[1.4.18,1.4.19)',\
        org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.io;version='[9.4.43,9.4.44)',\
@@ -59,7 +57,6 @@ Fragment-Host: org.openhab.binding.feed
        junit-platform-launcher;version='[1.8.1,1.8.2)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\
@@ -75,4 +72,7 @@ Fragment-Host: org.openhab.binding.feed
        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.openhab.core.thing.xml;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index db2cc99f0721fa76041d064bcb795a006485e9a5..a11804ce5aca55393260c015d7014c40acfe0a4f 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -40,8 +40,6 @@ Fragment-Host: org.openhab.binding.hue
        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.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
-       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
        xstream;version='[1.4.18,1.4.19)',\
        org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\
@@ -63,7 +61,6 @@ Fragment-Host: org.openhab.binding.hue
        junit-platform-launcher;version='[1.8.1,1.8.2)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -79,4 +76,7 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.io.net;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.openhab.core.thing.xml;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index f753107e7b8b7c524ae62ac4efc9ebf778ad64b9..a9bcecae7594cb898161c240af85e1ed49bc1811 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -53,7 +53,6 @@ Fragment-Host: org.openhab.binding.max
        junit-platform-launcher;version='[1.8.1,1.8.2)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.max;version='[3.3.0,3.3.1)',\
@@ -66,4 +65,5 @@ Fragment-Host: org.openhab.binding.max
        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.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index 5b4f52e175bd794f4a0bd59edb81c14e87a7a66c..555765dc6ee4a3a5f975dc7b12adac24d7349f33 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -33,8 +33,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
        javax.measure.unit-api;version='[2.1.2,2.1.3)',\
        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.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
        org.jsr-305;version='[3.0.2,3.0.3)',\
        org.osgi.service.cm;version='[1.6.0,1.6.1)',\
@@ -66,7 +64,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.23,7.3.24)',\
@@ -85,4 +82,7 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.io.net;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.openhab.core.thing.xml;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 757048516a4c406eb5e21fa956a0bd8d06ed7e6d..dd7d383b88a426df56b0341e97ae22e8b89927aa 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -60,7 +60,6 @@ Fragment-Host: org.openhab.binding.modbus
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.modbus;version='[3.3.0,3.3.1)',\
@@ -75,4 +74,5 @@ Fragment-Host: org.openhab.binding.modbus
        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.openhab.core.transform;version='[3.3.0,3.3.1)'
+       org.openhab.core.transform;version='[3.3.0,3.3.1)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 70c3dde0d2bb19edb8b884cc54d4f87cebbf027c..2573ea42adae59c8b4bdff9165a0aa19c158996c 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -49,8 +49,6 @@ Fragment-Host: org.openhab.binding.nest
        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.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
-       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
        xstream;version='[1.4.18,1.4.19)',\
        org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\
@@ -86,7 +84,6 @@ Fragment-Host: org.openhab.binding.nest
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.23,7.3.24)',\
        org.ops4j.pax.web.pax-web-spi;version='[7.3.23,7.3.24)',\
@@ -104,4 +101,7 @@ Fragment-Host: org.openhab.binding.nest
        org.openhab.core.io.net;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.openhab.core.thing.xml;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index af2ab5b991fec7f16c4469b66b4cece3f1321a77..8e7fd84c8e7366b56d3456e3463a2abfd934ed13 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -57,7 +57,6 @@ Fragment-Host: org.openhab.binding.ntp
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.ntp;version='[3.3.0,3.3.1)',\
@@ -70,4 +69,5 @@ Fragment-Host: org.openhab.binding.ntp
        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.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 414fa1fcc593c4e6bac44831765f49deaceb25ab..c1341749f52203997d3f3b9783e4fc380a22a22b 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -60,7 +60,6 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.systeminfo;version='[3.3.0,3.3.1)',\
@@ -73,4 +72,5 @@ Fragment-Host: org.openhab.binding.systeminfo
        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.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index b67c9607375d9c5245524e0ef587a9cc888262a2..89e200d572a6fae4f6ddca82f08a5db28ccb9747 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -61,7 +61,6 @@ Fragment-Host: org.openhab.binding.tradfri
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.binding.tradfri;version='[3.3.0,3.3.1)',\
@@ -76,4 +75,5 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.io.transport.mdns;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.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index a7ae09a2f110557bb9bcc43b0942dd0a6cb05548..1e12896ae6a39609417bd8c66abae778888c714f 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -39,8 +39,6 @@ Fragment-Host: org.openhab.binding.wemo
        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.apache.xbean.bundleutils;version='[4.19.0,4.19.1)',\
-       org.apache.xbean.finder;version='[4.19.0,4.19.1)',\
        xstream;version='[1.4.18,1.4.19)',\
        org.eclipse.jetty.client;version='[9.4.43,9.4.44)',\
        org.eclipse.jetty.http;version='[9.4.43,9.4.44)',\
@@ -66,7 +64,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.objenesis;version='[3.2.0,3.2.1)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.23,7.3.24)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
@@ -83,4 +80,7 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.io.transport.upnp;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.openhab.core.thing.xml;version='[3.3.0,3.3.1)'
+       org.openhab.core.thing.xml;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)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 4b40996cabaa8044a72d7116efd08c6bad35b6c0..d7c8ab608468ed32a52a4c7c955606600d446fad 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -49,7 +49,6 @@ Fragment-Host: org.openhab.persistence.mapdb
        junit-platform-launcher;version='[1.8.1,1.8.2)',\
        biz.aQute.tester.junit-platform;version='[6.1.0,6.1.1)',\
        org.apache.felix.scr;version='[2.1.30,2.1.31)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.12,2.0.13)',\
        org.osgi.util.function;version='[1.2.0,1.2.1)',\
        org.osgi.util.promise;version='[1.2.0,1.2.1)',\
        org.openhab.core;version='[3.3.0,3.3.1)',\
@@ -57,4 +56,5 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.openhab.core.persistence;version='[3.3.0,3.3.1)',\
        org.openhab.core.test;version='[3.3.0,3.3.1)',\
        org.openhab.persistence.mapdb;version='[3.3.0,3.3.1)',\
-       org.openhab.persistence.mapdb.tests;version='[3.3.0,3.3.1)'
+       org.openhab.persistence.mapdb.tests;version='[3.3.0,3.3.1)',\
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.14,2.0.15)'

diff --git a/pom.xml b/pom.xml
index 952d98b984c00c94067e3d03b8c6fa27812f884c..a51a6353a5aee9945fa411fdd513daf03d9598d5 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.5</jackson.version>
-    <karaf.version>4.3.4</karaf.version>
+    <karaf.version>4.3.6</karaf.version>
     <netty.version>4.1.72.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
     <sat.version>0.12.0</sat.version>