public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Karaf to 4.3.1 (#10424)

Browse Source 
* 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>
This commit is contained in:
Wouter Born
2021-04-02 20:00:30 +02:00
committed by GitHub
parent 05b25f3ab1
commit 260d6ba083
18 changed files with 208 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
itests/org.openhab.binding.modbus.tests/itest.bndrun
View File

@@ -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)'

19
itests/org.openhab.binding.modbus.tests/logback.xml
View File

@@ -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>