diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 88ff5e6db..540fc7772 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -231,13 +231,19 @@ si.uom si-units - 2.2 + 2.2.3 + compile + + + si.uom + si-quantity + 2.2.3 compile tech.units indriya - 2.2.2 + 2.2.3 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index ef3fb61a5..0a2375dfb 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -507,19 +507,19 @@ org.openhab.osgiify si.uom.si-units - 2.2 + 2.2.3 compile - si.uom - si-quantity - 2.2 + org.openhab.osgiify + si.uom.si-quantity + 2.2.3 compile tech.units indriya - 2.2.2 + 2.2.3 compile diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index f7c2e6334..4441542dd 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -29,9 +29,10 @@ mvn:jakarta.inject/jakarta.inject-api/1.0.5 mvn:javax.measure/unit-api/2.2 - mvn:org.openhab.osgiify/si.uom.si-units/2.2 - mvn:si.uom/si-quantity/2.2 - mvn:tech.units/indriya/2.2.2 + mvn:org.openhab.osgiify/si.uom.si-units/2.2.3 + + mvn:org.openhab.osgiify/si.uom.si-quantity/2.2.3 + mvn:tech.units/indriya/2.2.3 mvn:tech.uom.lib/uom-lib-common/2.2 mvn:org.apiguardian/apiguardian-api/1.1.2 mvn:org.osgi/org.osgi.service.component.annotations/1.5.1 diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun index 5ace3d276..f180a8aca 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -20,15 +20,15 @@ Fragment-Host: org.openhab.core.addon org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index 4bf56ced7..f3cd69c05 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -27,7 +27,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index db814b947..a87fff06e 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun index d55e1dce6..d036e9caf 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun index 31b75df30..6b45360bd 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -16,15 +16,15 @@ Fragment-Host: org.openhab.core.automation.module.script org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun index 367686577..c2ee2b6e8 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index b78ecc5a2..4b0c543bc 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index 84c0e5a5a..7f2f77f5e 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -17,8 +17,8 @@ Fragment-Host: org.openhab.core.config.core org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -30,7 +30,7 @@ Fragment-Host: org.openhab.core.config.core org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index 18955f594..9e17e42a2 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ javax.jmdns;version='[3.6.1,3.6.2)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -29,7 +29,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 23024ece6..5649d40f7 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -17,8 +17,8 @@ Fragment-Host: org.openhab.core.config.discovery org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -30,7 +30,7 @@ Fragment-Host: org.openhab.core.config.discovery org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun index 4f653bce6..dc1a43dd2 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -29,7 +29,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun index bfb8901e8..26e2f7b40 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -26,8 +26,8 @@ Provide-Capability: \ org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -38,7 +38,7 @@ Provide-Capability: \ org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 3d35b3373..663e07cff 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -16,14 +16,14 @@ Fragment-Host: org.openhab.core.config.dispatch org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index 3ad2104fe..112997bfa 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -21,15 +21,15 @@ feature.openhab-config: \ org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index db56fb2dd..bd9b9f6d3 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -21,10 +21,10 @@ Fragment-Host: org.openhab.core.io.net org.hamcrest;version='[3.0.0,3.0.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun index b27189ce7..eea8d9a41 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -22,8 +22,8 @@ Fragment-Host: org.openhab.core.io.rest.core org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ @@ -36,7 +36,7 @@ Fragment-Host: org.openhab.core.io.rest.core org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index e4d2a47e7..27bb15eb1 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -21,14 +21,14 @@ Fragment-Host: org.openhab.core.model.item org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 8caeaed27..b004df473 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -24,15 +24,15 @@ Fragment-Host: org.openhab.core.model.rule.runtime org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index b289659d8..05a7a2d5c 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -24,8 +24,8 @@ Fragment-Host: org.openhab.core.model.script org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -37,7 +37,7 @@ Fragment-Host: org.openhab.core.model.script org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 394799b24..2c2c15ace 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -22,8 +22,8 @@ Fragment-Host: org.openhab.core.model.thing org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ @@ -34,7 +34,7 @@ Fragment-Host: org.openhab.core.model.thing org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index f34a8ea52..f35510625 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -16,15 +16,15 @@ Fragment-Host: org.openhab.core.storage.json org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index cb8a1e547..ed47166c5 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index d36c0d59b..bd5c3a90b 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -20,8 +20,8 @@ Fragment-Host: org.openhab.core.thing org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ @@ -33,7 +33,7 @@ Fragment-Host: org.openhab.core.thing org.mockito.mockito-core;version='[4.11.0,4.11.1)',\ org.objenesis;version='[3.3.0,3.3.1)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index f69f9e9a9..807030254 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -21,15 +21,15 @@ Fragment-Host: org.openhab.core.voice org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\ jakarta.annotation-api;version='[2.1.1,2.1.2)',\ jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\ - si-units;version='[2.2.0,2.2.1)',\ - si.uom.si-quantity;version='[2.2.0,2.2.1)',\ + si-units;version='[2.2.3,2.2.4)',\ + si-quantity;version='[2.2.3,2.2.4)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ xstream;version='[1.4.21,1.4.22)',\ javax.measure.unit-api;version='[2.2.0,2.2.1)',\ - tech.units.indriya;version='[2.2.2,2.2.3)',\ + tech.units.indriya;version='[2.2.3,2.2.4)',\ uom-lib-common;version='[2.2.0,2.2.1)',\ io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\ com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\ diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index 91dbe05fa..d4440d4bb 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -102,12 +102,18 @@ si.uom si-units - 2.2 + 2.2.3 + + + si.uom + si-quantity + 2.2.3 + compile tech.units indriya - 2.2.2 + 2.2.3