Skip to content

Commit

Permalink
Upgrade Karaf to 4.3.1 (openhab#10424)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
wborn authored and thinkingstone committed Nov 7, 2021
1 parent f1002a4 commit 0d6100b
Show file tree
Hide file tree
Showing 18 changed files with 208 additions and 234 deletions.
35 changes: 26 additions & 9 deletions itests/itest-common.bndrun
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
12 changes: 6 additions & 6 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down Expand Up @@ -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)'
36 changes: 18 additions & 18 deletions itests/org.openhab.binding.avmfritz.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)',\
Expand All @@ -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)'
36 changes: 18 additions & 18 deletions itests/org.openhab.binding.feed.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)',\
Expand All @@ -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)'
36 changes: 18 additions & 18 deletions itests/org.openhab.binding.hue.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)',\
Expand All @@ -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)'
25 changes: 13 additions & 12 deletions itests/org.openhab.binding.max.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand All @@ -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)'
40 changes: 16 additions & 24 deletions itests/org.openhab.binding.modbus.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down Expand Up @@ -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)'
19 changes: 0 additions & 19 deletions itests/org.openhab.binding.modbus.tests/logback.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion itests/org.openhab.binding.mqtt.homie.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading

0 comments on commit 0d6100b

Please sign in to comment.