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

35
itests/itest-common.bndrun
View File

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