From: Wouter Born Date: Sun, 21 Nov 2021 11:40:56 +0000 (+0100) Subject: Resolve runbundles for UoM dependency upgrades (#11610) X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=926240770bc5442b5ce0ad77c3e0711779afd491;p=openhab-addons.git Resolve runbundles for UoM dependency upgrades (#11610) Signed-off-by: Wouter Born --- diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun index ecb7fd9df0..e265ddfc99 100644 --- a/itests/org.openhab.binding.astro.tests/itest.bndrun +++ b/itests/org.openhab.binding.astro.tests/itest.bndrun @@ -35,8 +35,6 @@ Fragment-Host: org.openhab.binding.astro org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -50,4 +48,6 @@ Fragment-Host: org.openhab.binding.astro org.openhab.core.thing;version='[3.2.0,3.2.1)',\ org.apache.felix.scr;version='[2.1.28,2.1.29)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun index 23bf948a88..bb71acf13d 100644 --- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun +++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun @@ -44,8 +44,6 @@ Fragment-Host: org.openhab.binding.avmfritz org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.avmfritz org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun index 9378160408..91b4b727a2 100644 --- a/itests/org.openhab.binding.feed.tests/itest.bndrun +++ b/itests/org.openhab.binding.feed.tests/itest.bndrun @@ -43,8 +43,6 @@ Fragment-Host: org.openhab.binding.feed javax.measure.unit-api;version='[2.1.2,2.1.3)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.feed org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun index f9a5396568..130bd397a5 100644 --- a/itests/org.openhab.binding.hue.tests/itest.bndrun +++ b/itests/org.openhab.binding.hue.tests/itest.bndrun @@ -44,8 +44,6 @@ Fragment-Host: org.openhab.binding.hue org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -79,4 +77,6 @@ Fragment-Host: org.openhab.binding.hue org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun index 850570bdbf..7c20ee86c8 100644 --- a/itests/org.openhab.binding.max.tests/itest.bndrun +++ b/itests/org.openhab.binding.max.tests/itest.bndrun @@ -40,8 +40,6 @@ Fragment-Host: org.openhab.binding.max org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -66,4 +64,6 @@ Fragment-Host: org.openhab.binding.max org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun index 47773da6de..8358537114 100644 --- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun +++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun @@ -49,8 +49,6 @@ Fragment-Host: org.openhab.binding.mielecloud org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ xstream;version='[1.4.18,1.4.19)',\ @@ -85,4 +83,6 @@ Fragment-Host: org.openhab.binding.mielecloud org.ops4j.pax.web.pax-web-jetty;version='[7.3.19,7.3.20)',\ org.ops4j.pax.web.pax-web-runtime;version='[7.3.19,7.3.20)',\ org.ops4j.pax.web.pax-web-spi;version='[7.3.19,7.3.20)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun index c97da2062a..1743c9d196 100644 --- a/itests/org.openhab.binding.modbus.tests/itest.bndrun +++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun @@ -47,8 +47,6 @@ Fragment-Host: org.openhab.binding.modbus org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -75,4 +73,6 @@ Fragment-Host: org.openhab.binding.modbus org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun index 2285316f46..747d200d28 100644 --- a/itests/org.openhab.binding.nest.tests/itest.bndrun +++ b/itests/org.openhab.binding.nest.tests/itest.bndrun @@ -58,8 +58,6 @@ Fragment-Host: org.openhab.binding.nest javax.measure.unit-api;version='[2.1.2,2.1.3)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -104,4 +102,6 @@ Fragment-Host: org.openhab.binding.nest org.apache.cxf.cxf-rt-rs-client;version='[3.4.5,3.4.6)',\ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.5,3.4.6)',\ org.apache.cxf.cxf-rt-security;version='[3.4.5,3.4.6)',\ - org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)' + org.apache.cxf.cxf-rt-transports-http;version='[3.4.5,3.4.6)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun index b83fea44b3..5f8338cbc2 100644 --- a/itests/org.openhab.binding.ntp.tests/itest.bndrun +++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun @@ -44,8 +44,6 @@ Fragment-Host: org.openhab.binding.ntp org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -70,4 +68,6 @@ Fragment-Host: org.openhab.binding.ntp org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun index 9f636c59fd..fef7f3d9e1 100644 --- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun +++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun @@ -45,8 +45,6 @@ Fragment-Host: org.openhab.binding.systeminfo org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -73,4 +71,6 @@ Fragment-Host: org.openhab.binding.systeminfo org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ com.sun.jna;version='[5.9.0,5.9.1)',\ com.sun.jna.platform;version='[5.9.0,5.9.1)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun index 866ac19bc6..62b4b0d968 100644 --- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun +++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun @@ -48,8 +48,6 @@ Fragment-Host: org.openhab.binding.tradfri org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -76,4 +74,6 @@ Fragment-Host: org.openhab.binding.tradfri org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun index 0e5f8e0e7a..7e73d49e08 100644 --- a/itests/org.openhab.binding.wemo.tests/itest.bndrun +++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun @@ -47,8 +47,6 @@ Fragment-Host: org.openhab.binding.wemo org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.osgi.service.cm;version='[1.6.0,1.6.1)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\ @@ -83,4 +81,6 @@ Fragment-Host: org.openhab.binding.wemo org.eclipse.jetty.websocket.common;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ org.ops4j.pax.web.pax-web-api;version='[7.3.19,7.3.20)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)' diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun index 2740fe5e9a..1e54765adc 100644 --- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun +++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun @@ -38,8 +38,6 @@ Fragment-Host: org.openhab.persistence.mapdb javax.measure.unit-api;version='[2.1.2,2.1.3)',\ org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ - si-units;version='[2.0.1,2.0.2)',\ - si.uom.si-quantity;version='[2.0.1,2.0.2)',\ tech.units.indriya;version='[2.1.2,2.1.3)',\ uom-lib-common;version='[2.1.0,2.1.1)',\ org.openhab.core;version='[3.2.0,3.2.1)',\ @@ -57,4 +55,6 @@ Fragment-Host: org.openhab.persistence.mapdb org.eclipse.jetty.util;version='[9.4.43,9.4.44)',\ org.eclipse.jetty.util.ajax;version='[9.4.43,9.4.44)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.0.10,2.0.11)',\ - biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)' + biz.aQute.tester.junit-platform;version='[6.0.0,6.0.1)',\ + si-units;version='[2.1.0,2.1.1)',\ + si.uom.si-quantity;version='[2.1.0,2.1.1)'