diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 54f8b5f5af0..e8955e19315 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -213,7 +213,7 @@
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>unit-api</artifactId>
-      <version>2.1.3</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -225,7 +225,7 @@
     <dependency>
       <groupId>tech.units</groupId>
       <artifactId>indriya</artifactId>
-      <version>2.1.2</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index a17459cd21a..c57e8c15cc6 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -490,7 +490,7 @@
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>unit-api</artifactId>
-      <version>2.1.2</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
     <!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
@@ -509,7 +509,7 @@
     <dependency>
       <groupId>tech.units</groupId>
       <artifactId>indriya</artifactId>
-      <version>2.1.2</version>
+      <version>2.2</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
index 95264a56ac0..60f85afcfac 100644
--- a/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
+++ b/bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
@@ -136,8 +136,9 @@ public void testHpaUnitSymbol() {
     public void testKelvin2Fahrenheit() {
         Quantity<Temperature> kelvin = Quantities.getQuantity(BigDecimal.ZERO, Units.KELVIN);
 
-        assertThat(kelvin.to(ImperialUnits.FAHRENHEIT),
-                is(Quantities.getQuantity(new BigDecimal("-459.67"), ImperialUnits.FAHRENHEIT)));
+        assertThat(kelvin.to(ImperialUnits.FAHRENHEIT).getValue().doubleValue(), is(closeTo(
+                Quantities.getQuantity(new BigDecimal("-459.67"), ImperialUnits.FAHRENHEIT).getValue().doubleValue(),
+                0.01)));
     }
 
     @Test
diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml
index 4f9460ad05f..a5b9ad7a9d5 100644
--- a/features/karaf/openhab-tp/src/main/feature/feature.xml
+++ b/features/karaf/openhab-tp/src/main/feature/feature.xml
@@ -28,12 +28,13 @@
 		<!-- Measurement -->
 		<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
 		<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.0</bundle>
-		<bundle dependency="true">mvn:javax.measure/unit-api/2.1.3</bundle>
+		<bundle dependency="true">mvn:javax.measure/unit-api/2.2</bundle>
 		<!-- The si.uom:si-units manifest has no Export-Package entry. As workaround this OSGi-ify bundle is used. -->
 		<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.1</bundle>
 		<bundle dependency="true">mvn:si.uom/si-quantity/2.1</bundle>
-		<bundle dependency="true">mvn:tech.units/indriya/2.1.2</bundle>
-		<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.1</bundle>
+		<bundle dependency="true">mvn:tech.units/indriya/2.2</bundle>
+		<bundle dependency="true">mvn:tech.uom.lib/uom-lib-common/2.2</bundle>
+		<bundle dependency="true">mvn:org.apiguardian/apiguardian-api/1.1.2</bundle>
 
 		<!-- TODO: Unbundled libraries -->
 		<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/1.4.20</bundle>
diff --git a/itests/org.openhab.core.addon.tests/itest.bndrun b/itests/org.openhab.core.addon.tests/itest.bndrun
index 6b48ac8a27c..98e21bbbafc 100644
--- a/itests/org.openhab.core.addon.tests/itest.bndrun
+++ b/itests/org.openhab.core.addon.tests/itest.bndrun
@@ -22,12 +22,8 @@ Fragment-Host: org.openhab.core.addon
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -61,4 +57,8 @@ Fragment-Host: org.openhab.core.addon
 	org.openhab.core.addon.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.config.core;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
index 144dab3b0cb..ca830f97013 100644
--- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun
@@ -20,12 +20,8 @@ Fragment-Host: org.openhab.core.automation
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.core.automation
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
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 af8a495d68a..cd8fd51a20b 100644
--- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun
@@ -20,12 +20,8 @@ Fragment-Host: org.openhab.core.automation.module.script
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -65,4 +61,8 @@ Fragment-Host: org.openhab.core.automation.module.script
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
index 53b88e4bfc3..90022058c33 100644
--- a/itests/org.openhab.core.config.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -19,12 +19,8 @@ Fragment-Host: org.openhab.core.config.core
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -63,4 +59,8 @@ Fragment-Host: org.openhab.core.config.core
 	org.openhab.core.config.core.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
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 660e7c8a32d..e4aeba2bbbd 100644
--- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
@@ -18,12 +18,8 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
index f1b8c437517..de5f18bdaf3 100644
--- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun
@@ -19,12 +19,8 @@ Fragment-Host: org.openhab.core.config.discovery
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -67,4 +63,8 @@ Fragment-Host: org.openhab.core.config.discovery
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
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 8ef16286b5f..13952018bf5 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
@@ -18,12 +18,8 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
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 fa053964cba..5e745ef04a3 100644
--- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
@@ -28,12 +28,8 @@ Provide-Capability: \
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -76,4 +72,8 @@ Provide-Capability: \
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
index 4d720adb4c4..2dc72fb519b 100644
--- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
+++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun
@@ -18,12 +18,8 @@ Fragment-Host: org.openhab.core.config.dispatch
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -56,4 +52,8 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.config.dispatch.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
index 6a02c504517..0a2c477d20a 100644
--- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun
+++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun
@@ -25,12 +25,8 @@ feature.openhab-config: \
 	jollyday;version='[0.5.10,0.5.11)',\
 	org.threeten.extra;version='[1.5.0,1.5.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -65,4 +61,8 @@ feature.openhab-config: \
 	org.openhab.core.ephemeris.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun
index 0eaf7dd727e..58716867e0e 100644
--- a/itests/org.openhab.core.io.net.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.net.tests/itest.bndrun
@@ -17,10 +17,8 @@ Fragment-Host: org.openhab.core.io.net
 	com.sun.jna;version='[5.12.1,5.12.2)',\
 	com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
 	io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	junit-jupiter-api;version='[5.9.2,5.9.3)',\
 	junit-jupiter-engine;version='[5.9.2,5.9.3)',\
 	junit-platform-commons;version='[1.9.2,1.9.3)',\
@@ -58,8 +56,6 @@ Fragment-Host: org.openhab.core.io.net
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.eclipse.jetty.http2.server;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.websocket.servlet;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.websocket.server;version='[9.4.50,9.4.51)',\
@@ -74,4 +70,8 @@ Fragment-Host: org.openhab.core.io.net
 	org.openhab.core.io.net.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.test;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
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 ae97d588564..6e9677460ac 100644
--- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
+++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun
@@ -33,12 +33,8 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
 	org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
 	stax2-api;version='[4.2.1,4.2.2)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	org.apache.cxf.cxf-core;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.5,3.4.6)',\
 	org.apache.cxf.cxf-rt-rs-client;version='[3.4.5,3.4.6)',\
@@ -108,4 +104,8 @@ Fragment-Host: org.openhab.core.io.rest.core
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun
index 7178a6b927a..0213525638a 100644
--- a/itests/org.openhab.core.model.item.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.item.tests/itest.bndrun
@@ -30,11 +30,7 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -82,7 +78,6 @@ Fragment-Host: org.openhab.core.model.item
 	org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\
-	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	junit-jupiter-api;version='[5.9.2,5.9.3)',\
 	junit-jupiter-engine;version='[5.9.2,5.9.3)',\
@@ -115,5 +110,9 @@ Fragment-Host: org.openhab.core.model.item
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun
index b668c453207..e1dba991d28 100644
--- a/itests/org.openhab.core.model.rule.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun
@@ -34,11 +34,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -119,5 +115,9 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun
index b278764476d..cf65e2602d7 100644
--- a/itests/org.openhab.core.model.script.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.script.tests/itest.bndrun
@@ -33,11 +33,7 @@ Fragment-Host: org.openhab.core.model.script
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -122,4 +118,8 @@ Fragment-Host: org.openhab.core.model.script
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.openhab.core.model.thing.runtime;version='[4.1.0,4.1.1)'
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	org.openhab.core.model.item.runtime;version='[4.1.0,4.1.1)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun
index 8de4af86738..9e08f6ee0de 100644
--- a/itests/org.openhab.core.model.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun
@@ -31,11 +31,7 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
 	com.google.guava;version='[30.1.0,30.1.1)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -83,7 +79,6 @@ Fragment-Host: org.openhab.core.model.thing
 	org.eclipse.jetty.http2.client;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.http2.common;version='[9.4.50,9.4.51)',\
 	org.eclipse.jetty.http2.hpack;version='[9.4.50,9.4.51)',\
-	org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
 	xstream;version='[1.4.20,1.4.21)',\
 	junit-jupiter-api;version='[5.9.2,5.9.3)',\
 	junit-jupiter-engine;version='[5.9.2,5.9.3)',\
@@ -124,4 +119,9 @@ Fragment-Host: org.openhab.core.model.thing
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun
index 4e75aaf5f13..3396796ca50 100644
--- a/itests/org.openhab.core.storage.json.tests/itest.bndrun
+++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun
@@ -18,12 +18,8 @@ Fragment-Host: org.openhab.core.storage.json
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -61,4 +57,8 @@ Fragment-Host: org.openhab.core.storage.json
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
-	org.osgi.service.cm;version='[1.6.0,1.6.1)'
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun
index 407c7de4c2a..c975de3219b 100644
--- a/itests/org.openhab.core.thing.tests/itest.bndrun
+++ b/itests/org.openhab.core.thing.tests/itest.bndrun
@@ -22,12 +22,8 @@ Fragment-Host: org.openhab.core.thing
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -68,4 +64,8 @@ Fragment-Host: org.openhab.core.thing
 	org.openhab.core.thing;version='[4.1.0,4.1.1)',\
 	org.openhab.core.thing.tests;version='[4.1.0,4.1.1)',\
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun
index e50ed771a88..a8fba8b37c2 100644
--- a/itests/org.openhab.core.voice.tests/itest.bndrun
+++ b/itests/org.openhab.core.voice.tests/itest.bndrun
@@ -22,12 +22,8 @@ Fragment-Host: org.openhab.core.voice
 	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
 	org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
-	jakarta.annotation-api;version='[2.0.0,2.0.1)',\
 	jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
-	javax.measure.unit-api;version='[2.1.2,2.1.3)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	tech.units.indriya;version='[2.1.2,2.1.3)',\
-	uom-lib-common;version='[2.1.0,2.1.1)',\
 	si-units;version='[2.1.0,2.1.1)',\
 	si.uom.si-quantity;version='[2.1.0,2.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
@@ -73,4 +69,8 @@ Fragment-Host: org.openhab.core.voice
 	org.openhab.core.transform;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice;version='[4.1.0,4.1.1)',\
 	org.openhab.core.voice.tests;version='[4.1.0,4.1.1)',\
-	org.openhab.base-fixes;version='[1.0.0,1.0.1)'
+	org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
+	javax.measure.unit-api;version='[2.2.0,2.2.1)',\
+	org.apiguardian.api;version='[1.1.2,1.1.3)',\
+	tech.units.indriya;version='[2.2.0,2.2.1)',\
+	uom-lib-common;version='[2.2.0,2.2.1)'
diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml
index 44a0ac71688..890c02c14b2 100644
--- a/tools/upgradetool/pom.xml
+++ b/tools/upgradetool/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>javax.measure</groupId>
       <artifactId>unit-api</artifactId>
-      <version>2.1.3</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>si.uom</groupId>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>tech.units</groupId>
       <artifactId>indriya</artifactId>
-      <version>2.1.2</version>
+      <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jdt</groupId>