diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun index 374d8e935ad..728dae89aee 100644 --- 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 461bd33b124..0637ea707e4 100644 --- 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 757ebfb982f..4cfd37a33a9 100644 --- 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 447d82b6e3e..9fa40faecd0 100644 --- 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 b0e2352e9fb..e5d5d0190aa 100644 --- 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 f06c39bd4c9..dd3e0e2f10b 100644 --- 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 acddae6d393..957129333c9 100644 --- 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 index 8f6fb7859b3..00000000000 --- a/itests/org.openhab.binding.modbus.tests/logback.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - - - - diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml index a517f94879a..b02ef5d68a9 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml @@ -7,7 +7,7 @@ org.openhab.addons.itests org.openhab.addons.reactor.itests - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT org.openhab.binding.mqtt.homeassistant.tests diff --git a/itests/org.openhab.binding.mqtt.homie.tests/pom.xml b/itests/org.openhab.binding.mqtt.homie.tests/pom.xml index 38625b1c744..7525a9b06b6 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/pom.xml +++ b/itests/org.openhab.binding.mqtt.homie.tests/pom.xml @@ -7,7 +7,7 @@ org.openhab.addons.itests org.openhab.addons.reactor.itests - 3.0.0-SNAPSHOT + 3.1.0-SNAPSHOT org.openhab.binding.mqtt.homie.tests diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index c8d8c0a6c8b..0afa7190687 100644 --- 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 index 4406c9eabca..00000000000 --- a/itests/org.openhab.binding.nest.tests/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - - diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 93d55d70ad2..9fee1b9e8e9 100644 --- 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 ea032fb0bae..ce15074c856 100644 --- 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 9d3407c12c4..1e666e1e535 100644 --- 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 90353298dc2..ee8787191c0 100644 --- 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 3d7694c5fe9..02c4554d17a 100644 --- 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 1d10dd422a0..2dcbd4606d3 100644 --- a/pom.xml +++ b/pom.xml @@ -73,9 +73,8 @@ 3.7.2 2.2.1 2.12.2 - 4.2.7 + 4.3.1 0.10.0 - 1.7.21 2.0.3