Skip to content

Commit 3d0ec78

Browse files
holgerfriedrichholgerfriedrich
authored
Upgrade Units of Measurement dependencies (#4979)
Upgrades UoM dependencies to: * si-units 2.2.3 * use osgiified si-quantity 2.2.3 * indriya 2.2.3 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 264c528 commit 3d0ec78

28 files changed

Lines changed: 97 additions & 84 deletions

File tree

‎bom/compile/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,19 @@
231231
<dependency>
232232
<groupId>si.uom</groupId>
233233
<artifactId>si-units</artifactId>
234-
<version>2.2</version>
234+
<version>2.2.3</version>
235+
<scope>compile</scope>
236+
</dependency>
237+
<dependency>
238+
<groupId>si.uom</groupId>
239+
<artifactId>si-quantity</artifactId>
240+
<version>2.2.3</version>
235241
<scope>compile</scope>
236242
</dependency>
237243
<dependency>
238244
<groupId>tech.units</groupId>
239245
<artifactId>indriya</artifactId>
240-
<version>2.2.2</version>
246+
<version>2.2.3</version>
241247
<scope>compile</scope>
242248
</dependency>
243249

‎bom/runtime/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,19 +507,19 @@
507507
<dependency>
508508
<groupId>org.openhab.osgiify</groupId>
509509
<artifactId>si.uom.si-units</artifactId>
510-
<version>2.2</version>
510+
<version>2.2.3</version>
511511
<scope>compile</scope>
512512
</dependency>
513513
<dependency>
514-
<groupId>si.uom</groupId>
515-
<artifactId>si-quantity</artifactId>
516-
<version>2.2</version>
514+
<groupId>org.openhab.osgiify</groupId>
515+
<artifactId>si.uom.si-quantity</artifactId>
516+
<version>2.2.3</version>
517517
<scope>compile</scope>
518518
</dependency>
519519
<dependency>
520520
<groupId>tech.units</groupId>
521521
<artifactId>indriya</artifactId>
522-
<version>2.2.2</version>
522+
<version>2.2.3</version>
523523
<scope>compile</scope>
524524
</dependency>
525525

‎features/karaf/openhab-tp/src/main/feature/feature.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
3030
<bundle dependency="true">mvn:javax.measure/unit-api/2.2</bundle>
3131
<!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
32-
<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.2</bundle>
33-
<bundle dependency="true">mvn:si.uom/si-quantity/2.2</bundle>
34-
<bundle dependency="true">mvn:tech.units/indriya/2.2.2</bundle>
32+
<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.2.3</bundle>
33+
<!-- The si.uom:si-quantity manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
34+
<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-quantity/2.2.3</bundle>
35+
<bundle dependency="true">mvn:tech.units/indriya/2.2.3</bundle>
3536
<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.2</bundle>
3637
<bundle dependency="true">mvn:org.apiguardian/apiguardian-api/1.1.2</bundle>
3738
<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.1</bundle>

‎itests/org.openhab.core.addon.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Fragment-Host: org.openhab.core.addon
2020
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
2121
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
2222
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
23-
si-units;version='[2.2.0,2.2.1)',\
24-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
23+
si-units;version='[2.2.3,2.2.4)',\
24+
si-quantity;version='[2.2.3,2.2.4)',\
2525
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2626
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2727
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
2828
org.osgi.service.component;version='[1.5.1,1.5.2)',\
2929
xstream;version='[1.4.21,1.4.22)',\
3030
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
31-
tech.units.indriya;version='[2.2.2,2.2.3)',\
31+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3232
uom-lib-common;version='[2.2.0,2.2.1)',\
3333
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3434
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.auth.oauth2client
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
@@ -27,7 +27,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
2727
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
2828
org.objenesis;version='[3.3.0,3.3.1)',\
2929
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
30-
tech.units.indriya;version='[2.2.2,2.2.3)',\
30+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3131
uom-lib-common;version='[2.2.0,2.2.1)',\
3232
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3333
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.automation.integration.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
@@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation
2828
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
2929
org.objenesis;version='[3.3.0,3.3.1)',\
3030
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
31-
tech.units.indriya;version='[2.2.2,2.2.3)',\
31+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3232
uom-lib-common;version='[2.2.0,2.2.1)',\
3333
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3434
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.automation.module.core.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
@@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation
2828
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
2929
org.objenesis;version='[3.3.0,3.3.1)',\
3030
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
31-
tech.units.indriya;version='[2.2.2,2.2.3)',\
31+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3232
uom-lib-common;version='[2.2.0,2.2.1)',\
3333
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3434
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.automation.module.script.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Fragment-Host: org.openhab.core.automation.module.script
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
2424
org.osgi.service.component;version='[1.5.1,1.5.2)',\
2525
xstream;version='[1.4.21,1.4.22)',\
2626
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
27-
tech.units.indriya;version='[2.2.2,2.2.3)',\
27+
tech.units.indriya;version='[2.2.3,2.2.4)',\
2828
uom-lib-common;version='[2.2.0,2.2.1)',\
2929
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3030
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.automation.module.timer.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
@@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation
2828
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
2929
org.objenesis;version='[3.3.0,3.3.1)',\
3030
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
31-
tech.units.indriya;version='[2.2.2,2.2.3)',\
31+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3232
uom-lib-common;version='[2.2.0,2.2.1)',\
3333
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3434
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

‎itests/org.openhab.core.automation.tests/itest.bndrun‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Fragment-Host: org.openhab.core.automation
1616
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
1717
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
1818
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
19-
si-units;version='[2.2.0,2.2.1)',\
20-
si.uom.si-quantity;version='[2.2.0,2.2.1)',\
19+
si-units;version='[2.2.3,2.2.4)',\
20+
si-quantity;version='[2.2.3,2.2.4)',\
2121
org.osgi.util.function;version='[1.2.0,1.2.1)',\
2222
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
2323
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
@@ -28,7 +28,7 @@ Fragment-Host: org.openhab.core.automation
2828
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
2929
org.objenesis;version='[3.3.0,3.3.1)',\
3030
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
31-
tech.units.indriya;version='[2.2.2,2.2.3)',\
31+
tech.units.indriya;version='[2.2.3,2.2.4)',\
3232
uom-lib-common;version='[2.2.0,2.2.1)',\
3333
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
3434
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\

0 commit comments

Comments
 (0)