Upgrade Karaf to 4.3.1 (#10424)

* Upgrades Karaf to 4.3.1
* Uses Pax Logging as runtime dependency instead of Felix Log
  To change the log level in itests, change the value of org.ops4j.pax.logging.DefaultServiceLog.level in itest-include.bndrun
* Adds --add-opens and nashorn.args in itest-include.bndrun to prevent some warnings being logged in itests

Related to openhab/openhab-distro#1167

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

diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun
index 374d8e935ad3a44bbb6af9e387198899dca1c937..728dae89aee8699c524c8b73aca677988c90aa77 100644 (file)
--- a/itests/itest-common.bndrun
+++ b/itests/itest-common.bndrun
@@ -1,8 +1,8 @@
 -standalone: \
-    ../../bom/runtime-index/target/index.xml;name="org.openhab.core.bom.runtime-index",\
-    ../../bom/test-index/target/index.xml;name="org.openhab.core.bom.test-index",\
-    ../../bom/openhab-core-index/target/index.xml;name="org.openhab.core.bom.openhab-core-index",\
-     target/index.xml;name="self"
+       ../../bom/runtime-index/target/index.xml;name="org.openhab.core.bom.runtime-index",\
+       ../../bom/test-index/target/index.xml;name="org.openhab.core.bom.test-index",\
+       ../../bom/openhab-core-index/target/index.xml;name="org.openhab.core.bom.openhab-core-index",\
+        target/index.xml;name="self"
 
 -resolve.effective: active
 
@@ -25,10 +25,27 @@ Export-Package:
 -exportcontents: 
 
 -runrequires.ee: \
-    bnd.identity;id='org.apache.servicemix.specs.activation-api-1.2.1',\
-    bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
-    bnd.identity;id='com.sun.xml.bind.jaxb-osgi'
+       bnd.identity;id='org.apache.servicemix.specs.activation-api-1.2.1',\
+       bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\
+       bnd.identity;id='com.sun.xml.bind.jaxb-osgi'
 
 -runrequires.junit: \
-    bnd.identity;id='biz.aQute.tester.junit-platform',\
-    bnd.identity;id='junit-jupiter-engine'
+       bnd.identity;id='biz.aQute.tester.junit-platform',\
+       bnd.identity;id='junit-jupiter-engine'
+
+-runproperties: \
+       nashorn.args=--no-deprecation-warning,\
+       org.ops4j.pax.logging.DefaultServiceLog.level=WARN
+
+-runvm.java9plus: \
+       --add-opens=java.base/java.io=ALL-UNNAMED,\
+       --add-opens=java.base/java.lang=ALL-UNNAMED,\
+       --add-opens=java.base/java.lang.reflect=ALL-UNNAMED,\
+       --add-opens=java.base/java.net=ALL-UNNAMED,\
+       --add-opens=java.base/java.security=ALL-UNNAMED,\
+       --add-opens=java.base/java.text=ALL-UNNAMED,\
+       --add-opens=java.base/java.time=ALL-UNNAMED,\
+       --add-opens=java.base/java.util=ALL-UNNAMED,\
+       --add-opens=java.desktop/java.awt.font=ALL-UNNAMED,\
+       --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED,\
+       --add-opens=java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED

diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 461bd33b124d4f7350ed945078d76021e8484e5b..0637ea707e4fb99c69834bdb256037d9f7b16a06 100644 (file)
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -10,13 +10,8 @@ Fragment-Host: org.openhab.binding.astro
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
@@ -44,4 +39,9 @@ Fragment-Host: org.openhab.binding.astro
        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.commons.lang3;version='[3.12.0,3.12.1)'
+       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)'

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 757ebfb982f1c87b064404e63411ccc6a7928922..4cfd37a33a94f21f0eb281f67f2842ce77d20346 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -14,28 +14,12 @@ Fragment-Host: org.openhab.binding.avmfritz
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        org.jupnp;version='[2.5.2,2.5.3)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
@@ -46,7 +30,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.objectweb.asm;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
        org.openhab.binding.avmfritz;version='[3.1.0,3.1.1)',\
        org.openhab.binding.avmfritz.tests;version='[3.1.0,3.1.1)',\
        org.openhab.core;version='[3.1.0,3.1.1)',\
@@ -68,4 +51,21 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.objenesis;version='[3.1.0,3.1.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 447d82b6e3e6fc54dbcaa6545947e68aee748b55..9fa40faecd03443052a931b2a0f7df433a14578f 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -21,26 +21,13 @@ Fragment-Host: org.openhab.binding.feed
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
-       org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
@@ -49,10 +36,6 @@ Fragment-Host: org.openhab.binding.feed
        org.objectweb.asm;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
-       org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
-       org.ops4j.pax.web.pax-web-runtime;version='[7.2.19,7.2.20)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)',\
        org.openhab.binding.feed;version='[3.1.0,3.1.1)',\
        org.openhab.binding.feed.tests;version='[3.1.0,3.1.1)',\
        org.openhab.core;version='[3.1.0,3.1.1)',\
@@ -71,4 +54,21 @@ Fragment-Host: org.openhab.binding.feed
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index b0e2352e9fb5b0e70216a8109841c002645b5ce4..e5d5d0190aae2836fcd3f9793fa529ac9e75eb2b 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -16,29 +16,13 @@ Fragment-Host: org.openhab.binding.hue
 # done
 #
 -runbundles: \
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.jupnp;version='[2.5.2,2.5.3)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
@@ -50,7 +34,6 @@ Fragment-Host: org.openhab.binding.hue
        org.objectweb.asm;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
        org.openhab.binding.hue;version='[3.1.0,3.1.1)',\
        org.openhab.binding.hue.tests;version='[3.1.0,3.1.1)',\
        org.openhab.core;version='[3.1.0,3.1.1)',\
@@ -72,4 +55,21 @@ Fragment-Host: org.openhab.binding.hue
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index f06c39bd4c9d777330ec7c425f831425a1dcf14b..dd3e0e2f10b41015c249268889f645db884d61c2 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -16,23 +16,12 @@ Fragment-Host: org.openhab.binding.max
 # done
 #
 -runbundles: \
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -58,4 +47,16 @@ Fragment-Host: org.openhab.binding.max
        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.commons.lang3;version='[3.12.0,3.12.1)'
+       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)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index acddae6d39395e6150f60096ef26e66321e8194f..957129333c968013b9e0f0da8e125e0ff4594145 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -6,43 +6,23 @@ Fragment-Host: org.openhab.binding.modbus
 -runrequires: \
        bnd.identity;id='org.openhab.binding.modbus.tests',\
        bnd.identity;id='org.openhab.core.binding.xml',\
-       bnd.identity;id='org.openhab.core.thing.xml',\
-       bnd.identity;id='ch.qos.logback.core',\
-       bnd.identity;id='ch.qos.logback.classic'
+       bnd.identity;id='org.openhab.core.thing.xml'
 
 # 1) We would like to use the "volatile" storage only, drop other storage
-# 2) We use logback (see logback.xml), drop others logging implementation 
-#    to avoid conflicts
 -runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb',\
-    bnd.identity;id='slf4j.simple',\
-    bnd.identity;id='org.apache.log4j'
-
--runproperties: \
-    logback.configurationFile=file:${.}/logback.xml
+       bnd.identity;id='org.openhab.core.storage.json',\
+       bnd.identity;id='org.openhab.core.storage.mapdb'
 
 #
 # done
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        nrjavaserial;version='[5.2.1,5.2.2)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
@@ -75,4 +55,16 @@ Fragment-Host: org.openhab.binding.modbus
        org.mockito.junit-jupiter;version='[3.7.0,3.7.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.modbus.tests/logback.xml b/itests/org.openhab.binding.modbus.tests/logback.xml
deleted file mode 100644 (file)
index 8f6fb78..0000000
--- a/itests/org.openhab.binding.modbus.tests/logback.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<configuration debug="true">
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-  
-  <logger name="org.openhab.binding.modbus" level="trace" />
-  <logger name="org.openhab.binding.modbus.tests" level="trace" />
-  <logger name="org.openhab.io.transport.modbus" level="trace" />
-  <logger name="net.wimpi.modbus" level="trace" />
-  <logger name="org.openhab.core.internal.items.ItemUpdater" level="trace" />
-  <logger name="org.openhab.core.internal.items.ItemStateConverterImpl" level="debug" />
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
index a517f94879ab63fda54f6efda2cc351f36de1a7a..b02ef5d68a9212cbaa7568bae1b1760cabc34a0f 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.openhab.addons.itests</groupId>
     <artifactId>org.openhab.addons.reactor.itests</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.mqtt.homeassistant.tests</artifactId>

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/pom.xml b/itests/org.openhab.binding.mqtt.homie.tests/pom.xml
index 38625b1c744e0fe8d57b24e9e6dcbd1a14b34a35..7525a9b06b602a58c3b0e8c2042af653ffa6f862 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.homie.tests/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.openhab.addons.itests</groupId>
     <artifactId>org.openhab.addons.reactor.itests</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.mqtt.homie.tests</artifactId>

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index c8d8c0a6c8b9a7cb5a7a956caf7607b88cdcf1a2..0afa7190687a2b0d01354003ca7867fdb907fa98 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -12,38 +12,17 @@ Fragment-Host: org.openhab.binding.nest
 -runblacklist: \
        bnd.identity;id='org.openhab.core.storage.json'
 
--runproperties: logback.configurationFile=file:${.}/logback.xml
-
 #
 # done
 #
 -runbundles: \
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-       org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
-       org.ops4j.pax.swissbox.optional.jcl;version='[1.8.3,1.8.4)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
        org.osgi.util.function;version='[1.1.0,1.1.1)',\
-       org.osgi.util.promise;version='[1.1.0,1.1.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
@@ -59,9 +38,6 @@ Fragment-Host: org.openhab.binding.nest
        org.objectweb.asm;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
-       org.ops4j.pax.web.pax-web-jetty;version='[7.2.19,7.2.20)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.2.19,7.2.20)',\
        org.openhab.binding.nest;version='[3.1.0,3.1.1)',\
        org.openhab.binding.nest.tests;version='[3.1.0,3.1.1)',\
        org.openhab.core;version='[3.1.0,3.1.1)',\
@@ -87,4 +63,24 @@ Fragment-Host: org.openhab.binding.nest
        org.objenesis;version='[3.1.0,3.1.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.nest.tests/logback.xml b/itests/org.openhab.binding.nest.tests/logback.xml
deleted file mode 100644 (file)
index 4406c9e..0000000
--- a/itests/org.openhab.binding.nest.tests/logback.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<configuration>
-
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <logger name="org.eclipse.jetty" level="info">
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <root level="info">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 93d55d70ad2694274063594036ba324c987385f9..9fee1b9e8e92620efd55bd7b13f0b4442b78099b 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -16,24 +16,13 @@ Fragment-Host: org.openhab.binding.ntp
 # done
 #
 -runbundles: \
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
        org.apache.commons.commons-net;version='[3.7.2,3.7.3)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -62,4 +51,16 @@ Fragment-Host: org.openhab.binding.ntp
        org.objenesis;version='[3.1.0,3.1.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index ea032fb0baee7b553868817ec2e6a1a50a4a15cf..ce15074c856b99124536bfdc5f290e8814cefbfb 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -19,24 +19,13 @@ Fragment-Host: org.openhab.binding.systeminfo
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        com.sun.jna;version='[5.5.0,5.5.1)',\
        com.sun.jna.platform;version='[5.5.0,5.5.1)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -66,4 +55,16 @@ Fragment-Host: org.openhab.binding.systeminfo
        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.commons.lang3;version='[3.12.0,3.12.1)'
+       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)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 9d3407c12c4356e6953907bb9c05337b442cda52..1e666e1e53597efe0b421bdcd7e6aad0bfc0679d 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -17,26 +17,15 @@ Fragment-Host: org.openhab.binding.tradfri
 #
 -runbundles: \
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        javax.jmdns;version='[3.5.6,3.5.7)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
        org.eclipse.californium.core;version='[2.0.0,2.0.1)',\
        org.eclipse.californium.element-connector;version='[2.0.0,2.0.1)',\
        org.eclipse.californium.scandium;version='[2.0.0,2.0.1)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -68,4 +57,16 @@ Fragment-Host: org.openhab.binding.tradfri
        org.objenesis;version='[3.1.0,3.1.1)',\
        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)'
+       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)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 90353298dc20751335cfb7f99e4e2214fa89beab..ee8787191c0f8c886a264429234b2aef4cc5ac9f 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -16,29 +16,13 @@ Fragment-Host: org.openhab.binding.wemo
 # done
 #
 -runbundles: \
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-       org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.jupnp;version='[2.5.2,2.5.3)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.api;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.client;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.websocket.common;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -49,7 +33,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.objectweb.asm;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.commons;version='[8.0.1,8.0.2)',\
        org.objectweb.asm.tree;version='[8.0.1,8.0.2)',\
-       org.ops4j.pax.web.pax-web-api;version='[7.2.19,7.2.20)',\
        org.openhab.binding.wemo;version='[3.1.0,3.1.1)',\
        org.openhab.binding.wemo.tests;version='[3.1.0,3.1.1)',\
        org.openhab.core;version='[3.1.0,3.1.1)',\
@@ -77,4 +60,21 @@ 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.commons.lang3;version='[3.12.0,3.12.1)'
+       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.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)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 3d7694c5fe9292c61af4e78a2e7a3e198bea9216..02c4554d17ae82b537c5b69617edcd31bdaba094 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -16,22 +16,12 @@ Fragment-Host: org.openhab.persistence.mapdb
 # done
 #
 -runbundles: \
-       ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-       ch.qos.logback.core;version='[1.2.3,1.2.4)',\
        javax.measure.unit-api;version='[1.0.0,1.0.1)',\
        org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-       org.apache.felix.scr;version='[2.1.10,2.1.11)',\
        org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
-       slf4j.api;version='[1.7.25,1.7.26)',\
        tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
        tec.uom.se;version='[1.0.10,1.0.11)',\
-       org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-       org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -50,4 +40,15 @@ Fragment-Host: org.openhab.persistence.mapdb
        junit-platform-launcher;version='[1.7.0,1.7.1)',\
        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)'
+       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)'

diff --git a/pom.xml b/pom.xml
index 1d10dd422a0a7b68b6a5fbf4ce2600db11c0da9b..2dcbd4606d390aa7b8fb815c9c8a125cca7a5189 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -73,9 +73,8 @@
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.2.1</eea.version>
     <jackson.version>2.12.2</jackson.version>
-    <karaf.version>4.2.7</karaf.version>
+    <karaf.version>4.3.1</karaf.version>
     <sat.version>0.10.0</sat.version>
-    <slf4j.version>1.7.21</slf4j.version>
     <spotless.version>2.0.3</spotless.version>
 
     <bnd.importpackage/>