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

View File

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