diff --git a/bundles/org.openhab.binding.lametrictime/pom.xml b/bundles/org.openhab.binding.lametrictime/pom.xml index f499ac2aa26..93375308194 100644 --- a/bundles/org.openhab.binding.lametrictime/pom.xml +++ b/bundles/org.openhab.binding.lametrictime/pom.xml @@ -54,10 +54,10 @@ - junit - junit - 4.12 - test + org.apache.servicemix.specs + org.apache.servicemix.specs.activation-api-1.2.1 + 1.2.1_2 + compile com.googlecode.junit-toolbox diff --git a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml index 08d40165adc..3c7bdc851d3 100644 --- a/bundles/org.openhab.binding.mail/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.mail/src/main/feature/feature.xml @@ -5,6 +5,7 @@ openhab-runtime-base mvn:com.sun.mail/javax.mail/1.6.2 + mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0 mvn:org.openhab.addons.bundles/org.openhab.binding.mail/${project.version} diff --git a/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml b/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml index 16803bd3478..6f41ae9efc4 100644 --- a/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml +++ b/bundles/org.openhab.binding.pushbullet/src/main/feature/feature.xml @@ -4,6 +4,7 @@ openhab-runtime-base + mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.9.0 mvn:org.openhab.addons.bundles/org.openhab.binding.pushbullet/${project.version} diff --git a/features/openhab-addons/src/main/resources/footer.xml b/features/openhab-addons/src/main/resources/footer.xml index 96832fc2821..70dda14930f 100644 --- a/features/openhab-addons/src/main/resources/footer.xml +++ b/features/openhab-addons/src/main/resources/footer.xml @@ -27,7 +27,7 @@ mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.e3dc/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.helioseasycontrols/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.stiebeleltron/${project.version} - mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.studer/${project.version} + mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.studer/${project.version} mvn:org.openhab.addons.bundles/org.openhab.binding.modbus.sunspec/${project.version} diff --git a/itests/itest-common.bndrun b/itests/itest-common.bndrun index 6c9bff3bb39..374d8e935ad 100644 --- a/itests/itest-common.bndrun +++ b/itests/itest-common.bndrun @@ -25,9 +25,9 @@ Export-Package: -exportcontents: -runrequires.ee: \ - bnd.identity;id='org.apache.servicemix.specs.activation-api-1.1',\ - bnd.identity;id='org.apache.servicemix.specs.jaxb-api-2.2',\ - bnd.identity;id='org.apache.servicemix.bundles.jaxb-impl' + 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',\ diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index 9abb04967ff..66337841643 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -19,13 +19,9 @@ Fragment-Host: org.openhab.binding.astro org.objenesis;version='[2.6.0,2.6.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ com.google.gson;version='[2.8.2,2.8.3)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ junit-jupiter-api;version='[5.6.2,5.6.3)',\ junit-jupiter-engine;version='[5.6.2,5.6.3)',\ @@ -44,4 +40,8 @@ Fragment-Host: org.openhab.binding.astro org.openhab.core.io.console;version='[3.0.0,3.0.1)',\ org.openhab.core.storage.json;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index e8ce24dbed0..67318a3b46e 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -26,12 +26,8 @@ Fragment-Host: org.openhab.binding.avmfritz com.google.gson;version='[2.8.2,2.8.3)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ @@ -68,4 +64,8 @@ Fragment-Host: org.openhab.binding.avmfritz org.openhab.core.io.net;version='[3.0.0,3.0.1)',\ org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ + org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index bcd3e527ba9..e2ce0982530 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -20,9 +20,6 @@ Fragment-Host: org.openhab.binding.feed # done # -runbundles: \ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ org.apache.felix.scr;version='[2.1.10,2.1.11)',\ @@ -32,12 +29,10 @@ Fragment-Host: org.openhab.binding.feed 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.commons.io;version='[2.2.0,2.2.1)',\ 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.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ @@ -72,4 +67,8 @@ Fragment-Host: org.openhab.binding.feed org.openhab.core.thing.xml;version='[3.0.0,3.0.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)' \ No newline at end of file + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' \ No newline at end of file diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index f07fb47f10c..b5250125bcc 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.hue -runrequires: \ - bnd.identity;id='org.openhab.binding.hue.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.hue.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' # # done @@ -25,12 +29,8 @@ Fragment-Host: org.openhab.binding.hue org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ @@ -68,4 +68,8 @@ Fragment-Host: org.openhab.binding.hue org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)' + org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 699aa1bc8e9..25115587818 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.max -runrequires: \ - bnd.identity;id='org.openhab.binding.max.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.max.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' # # done @@ -24,12 +28,8 @@ Fragment-Host: org.openhab.binding.max org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -54,4 +54,8 @@ Fragment-Host: org.openhab.binding.max org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index 363e688ef1c..4a985159de4 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -36,12 +36,8 @@ Fragment-Host: org.openhab.binding.modbus org.objenesis;version='[2.6.0,2.6.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ com.google.gson;version='[2.8.2,2.8.3)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -77,4 +73,8 @@ Fragment-Host: org.openhab.binding.modbus org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ org.openhab.core.transform;version='[3.0.0,3.0.1)',\ org.openhab.io.transport.modbus;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun index 49b1796db10..0d60a1ca8a2 100644 --- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun @@ -29,9 +29,6 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant 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.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ @@ -47,7 +44,6 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant 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)',\ - org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ com.google.dagger;version='[2.20.0,2.20.1)',\ com.hivemq.client.mqtt;version='[1.1.2,1.1.3)',\ @@ -91,4 +87,8 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant org.openhab.core.transform;version='[3.0.0,3.0.1)',\ org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ - org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)' + org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\ + jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ + org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun index 8d9ecadab7d..2c862325e96 100644 --- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun +++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun @@ -28,9 +28,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie 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.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ org.objenesis;version='[2.6.0,2.6.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ @@ -46,7 +43,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie io.netty.transport;version='[4.1.42,4.1.43)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\ com.google.dagger;version='[2.20.0,2.20.1)',\ @@ -92,5 +88,8 @@ Fragment-Host: org.openhab.binding.mqtt.homie org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\ - moquette-broker;version='[0.13.0,0.13.1)' + jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ + org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index 22ee03cf3b0..0bd63c939ba 100644 --- a/itests/org.openhab.binding.nest.tests/itest.bndrun +++ b/itests/org.openhab.binding.nest.tests/itest.bndrun @@ -22,18 +22,12 @@ Fragment-Host: org.openhab.binding.nest ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.measure.unit-api;version='[1.0.0,1.0.1)',\ - javax.xml.soap-api;version='[1.3.5,1.3.6)',\ 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.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxws-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\ org.apache.xbean.finder;version='[4.12.0,4.12.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ @@ -88,4 +82,9 @@ Fragment-Host: org.openhab.binding.nest org.mockito.mockito-core;version='[3.4.6,3.4.7)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\ - org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)' + org.apache.aries.jax.rs.whiteboard;version='[1.0.9,1.0.10)',\ + com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\ + org.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + javax.xml.soap-api;version='[1.4.0,1.4.1)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\ + org.apache.servicemix.specs.jaxws-api-2.3;version='[2.3.0,2.3.1)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index 673235aed9a..5c361fabfde 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.ntp -runrequires: \ - bnd.identity;id='org.openhab.binding.ntp.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.ntp.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' # # done @@ -26,12 +30,8 @@ Fragment-Host: org.openhab.binding.ntp org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -59,4 +59,8 @@ Fragment-Host: org.openhab.binding.ntp org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index a65a969e3b8..ae7975e8c72 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -4,11 +4,16 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.systeminfo -runrequires: \ - bnd.identity;id='org.openhab.binding.systeminfo.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.systeminfo.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' -runsystemcapabilities: ${native_capability} + # # done # @@ -21,9 +26,6 @@ Fragment-Host: org.openhab.binding.systeminfo org.apache.felix.scr;version='[2.1.10,2.1.11)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.objenesis;version='[2.6.0,2.6.1)',\ org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ slf4j.api;version='[1.7.25,1.7.26)',\ @@ -31,7 +33,6 @@ Fragment-Host: org.openhab.binding.systeminfo 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)',\ - org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -61,4 +62,8 @@ Fragment-Host: org.openhab.binding.systeminfo org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 1af32d5a567..caa73b5703d 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.tradfri -runrequires: \ - bnd.identity;id='org.openhab.binding.tradfri.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.tradfri.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' # # done @@ -21,15 +25,11 @@ Fragment-Host: org.openhab.binding.tradfri org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ com.google.gson;version='[2.8.2,2.8.3)',\ javax.jmdns;version='[3.5.5,3.5.6)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\ org.objenesis;version='[2.6.0,2.6.1)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -63,4 +63,8 @@ Fragment-Host: org.openhab.binding.tradfri org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index b1776653b42..3eae6dadb40 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -4,9 +4,13 @@ Bundle-SymbolicName: ${project.artifactId} Fragment-Host: org.openhab.binding.wemo -runrequires: \ - bnd.identity;id='org.openhab.binding.wemo.tests',\ - bnd.identity;id='org.openhab.core.binding.xml',\ - bnd.identity;id='org.openhab.core.thing.xml' + bnd.identity;id='org.openhab.binding.wemo.tests',\ + bnd.identity;id='org.openhab.core.binding.xml',\ + bnd.identity;id='org.openhab.core.thing.xml' + +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' # # done @@ -27,12 +31,8 @@ Fragment-Host: org.openhab.binding.wemo org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ org.objectweb.asm;version='[7.1.0,7.1.1)',\ org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\ org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\ @@ -73,4 +73,8 @@ Fragment-Host: org.openhab.binding.wemo org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.openhab.core.thing;version='[3.0.0,3.0.1)',\ org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun index e690bf692d5..c3fa9880cc5 100644 --- a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun +++ b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun @@ -18,10 +18,6 @@ Fragment-Host: org.openhab.io.mqttembeddedbroker # done # -runbundles: \ - org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ com.google.gson;version='[2.8.2,2.8.3)',\ com.h2database.mvstore;version='[1.4.199,1.4.200)',\ @@ -76,4 +72,7 @@ Fragment-Host: org.openhab.io.mqttembeddedbroker org.openhab.io.mqttembeddedbroker.tests;version='[3.0.0,3.0.1)',\ org.opentest4j;version='[1.2.0,1.2.1)',\ org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\ - moquette-broker;version='[0.13.0,0.13.1)' + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 0d24204e46e..128e2bcd836 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -8,6 +8,10 @@ Fragment-Host: org.openhab.persistence.mapdb bnd.identity;id='org.openhab.core',\ bnd.identity;id='org.openhab.persistence.mapdb' +# We would like to use the "volatile" storage only +-runblacklist: \ + bnd.identity;id='org.openhab.core.storage.json' + # # done # @@ -25,12 +29,8 @@ Fragment-Host: org.openhab.persistence.mapdb org.openhab.core.test;version='[3.0.0,3.0.1)',\ org.osgi.service.event;version='[1.4.0,1.4.1)',\ slf4j.api;version='[1.7.25,1.7.26)',\ - org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\ - org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\ 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.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\ 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)',\ @@ -46,4 +46,8 @@ Fragment-Host: org.openhab.persistence.mapdb junit-platform-engine;version='[1.6.2,1.6.3)',\ junit-platform-launcher;version='[1.6.2,1.6.3)',\ org.hamcrest;version='[2.2.0,2.2.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)' + org.opentest4j;version='[1.2.0,1.2.1)',\ + 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.glassfish.hk2.osgi-resource-locator;version='[1.0.1,1.0.2)',\ + org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)' diff --git a/pom.xml b/pom.xml index 92bb901e34e..9090c209029 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ Import-Package: \\ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 eclipse @@ -295,12 +295,12 @@ Import-Package: \\ org.codehaus.plexus plexus-compiler-eclipse - 2.8.5 + 2.8.8 org.eclipse.jdt ecj - 3.16.0 + 3.23.0