OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade glassfish hk2 to 3.1.1, upgrade units (#4658) 

* Upgrade glassfish hk2 from 2.4.0-b34 to 3.1.1
* Upgrade jakarta.inject-api from 2.0.0 to 2.0.1
  https://github.com/jakartaee/inject/releases/tag/2.0.1
* Upgrade jakarta.annotation-api from 2.0.0 to 2.1.1
* Upgrade si.uom:si-units and si-quantity from 2.1 to 2.2, including
  transition from jakarta.annotation-api 1.3.4 to 2.0.0
* Upgrade tech.units.indriya from 2.2 to 2.2.2
* Adapt test to inriya >2.2 (year, yr)
* Resolve bundles
* Upgrade glassfish hk2 osgi-resource-locator to 3.0.0
* Upgrade osgi-resource-locator from 1.0.3 to 3.0.0

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
pull/4680/head
Holger Friedrich 2025-03-23 17:03:31 +01:00 committed by GitHub
parent 328aa7e4a5
commit f972e95c6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 176 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bom/compile/pom.xml
View File

@ -212,13 +212,13 @@
<dependency>
<groupId>si.uom</groupId>
<artifactId>si-units</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>tech.units</groupId>
<artifactId>indriya</artifactId>
<version>2.2</version>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>

29
bom/runtime/pom.xml
View File

@ -494,13 +494,13 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.0.0</version>
<version>2.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -513,19 +513,19 @@
<dependency>
<groupId>org.openhab.osgiify</groupId>
<artifactId>si.uom.si-units</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>si.uom</groupId>
<artifactId>si-quantity</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>tech.units</groupId>
<artifactId>indriya</artifactId>
<version>2.2</version>
<version>2.2.2</version>
<scope>compile</scope>
</dependency>
@ -923,37 +923,40 @@
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-api</artifactId>
<version>2.4.0-b34</version>
<version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
<version>2.4.0-b34</version>
<version>3.1.1</version>
<scope>compile</scope>
</dependency>
<!-- 2.5.0-b62 was the last before switching to jakarta namespace,
artifact id javax.inject -> jakarta.inject
-->
<dependency>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
<version>2.4.0-b34</version>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
<version>2.4.0-b34</version>
<version>3.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>osgi-resource-locator</artifactId>
<version>1.0.3</version>
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-utils</artifactId>
<version>2.4.0-b34</version>
<version>3.1.1</version>
<scope>compile</scope>
</dependency>

2
bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java
View File

@ -170,7 +170,7 @@ public final class Units extends CustomUnits {
MultiplyConverter.ofRational(BigInteger.valueOf(100000), BigInteger.ONE)));
public static final Unit<Pressure> MILLIBAR = addUnit(MetricPrefix.MILLI(BAR));
public static final Unit<Radioactivity> BECQUEREL = addUnit(tech.units.indriya.unit.Units.BECQUEREL);
public static final Unit<Radioactivity> CURIE = addUnit(NonSI.CURIE);
public static final Unit<Radioactivity> CURIE = addUnit(BECQUEREL.multiply(37000000000L));
public static final Unit<Radioactivity> MILLI_CURIE = addUnit(MetricPrefix.MILLI(CURIE));
public static final Unit<Radioactivity> MICRO_CURIE = addUnit(MetricPrefix.MICRO(CURIE));
public static final Unit<Radioactivity> NANO_CURIE = addUnit(MetricPrefix.NANO(CURIE));

2
bundles/org.openhab.core/src/test/java/org/openhab/core/library/unit/UnitsTest.java
View File

@ -425,7 +425,7 @@ public class UnitsTest {
@Test
public void testYearMonthDay() {
QuantityType<?> year = QuantityType.valueOf("1 y");
assertThat(year.toString(), is("1 year"));
assertThat(year.toString(), is("1 yr"));
QuantityType<?> converted = year.toUnit("d");
assertThat(converted.doubleValue(), is(closeTo(365.2425, DEFAULT_ERROR)));
QuantityType<?> converted2 = year.toUnit("mo");

8
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -25,13 +25,13 @@
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
<!-- Measurement -->
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.0.0</bundle>
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</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.2</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/si.uom.si-units/2.2</bundle>
<bundle dependency="true">mvn:si.uom/si-quantity/2.2</bundle>
<bundle dependency="true">mvn:tech.units/indriya/2.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>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.1</bundle>

13
itests/org.openhab.core.addon.tests/itest.bndrun
View File

@ -17,19 +17,18 @@ Fragment-Host: org.openhab.core.addon
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.automation.integration.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.automation
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.automation
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View File

@ -13,19 +13,18 @@ Fragment-Host: org.openhab.core.automation.module.script
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.automation
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.automation.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.automation
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.config.core.tests/itest.bndrun
View File

@ -14,11 +14,11 @@ Fragment-Host: org.openhab.core.config.core
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
javax.jmdns;version='[3.5.12,3.5.13)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
@ -29,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.config.discovery.tests/itest.bndrun
View File

@ -14,11 +14,11 @@ Fragment-Host: org.openhab.core.config.discovery
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

12
itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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.usbserial.linuxsysfs
org.objenesis;version='[3.3.0,3.3.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)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View File

@ -23,11 +23,11 @@ Provide-Capability: \
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View File

@ -13,18 +13,17 @@ Fragment-Host: org.openhab.core.config.dispatch
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.ephemeris.tests/itest.bndrun
View File

@ -18,19 +18,18 @@ feature.openhab-config: \
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.io.net.tests/itest.bndrun
View File

@ -10,22 +10,21 @@ Fragment-Host: org.openhab.core.io.net
bnd.identity;id='org.apache.aries.spifly.dynamic.bundle'
-runbundles: \
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
jakarta.inject.jakarta.inject-api;version='[2.0.1,2.0.2)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
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.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
jakarta.annotation-api;version='[2.1.1,2.1.2)',\
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
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.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
si-units;version='[2.2.0,2.2.1)',\
si.uom.si-quantity;version='[2.2.0,2.2.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)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -18,12 +18,12 @@ Fragment-Host: org.openhab.core.io.rest.core
org.hamcrest;version='[3.0.0,3.0.1)',\
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)',\
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

15
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -12,24 +12,23 @@ Fragment-Host: org.openhab.core.model.item
#
-runbundles: \
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
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.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

15
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -15,25 +15,24 @@ Fragment-Host: org.openhab.core.model.rule.runtime
#
-runbundles: \
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
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.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

15
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -15,17 +15,17 @@ Fragment-Host: org.openhab.core.model.script
#
-runbundles: \
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
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.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

15
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -13,17 +13,17 @@ Fragment-Host: org.openhab.core.model.thing
#
-runbundles: \
org.antlr.runtime;version='[3.2.0,3.2.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.hamcrest;version='[3.0.0,3.0.1)',\
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.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.storage.json.tests/itest.bndrun
View File

@ -13,19 +13,18 @@ Fragment-Host: org.openhab.core.storage.json
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.tests/itest.bndrun
View File

@ -13,11 +13,11 @@ Fragment-Host: org.openhab.core
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

13
itests/org.openhab.core.thing.tests/itest.bndrun
View File

@ -17,11 +17,11 @@ Fragment-Host: org.openhab.core.thing
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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,8 +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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

16
itests/org.openhab.core.voice.tests/itest.bndrun
View File

@ -4,7 +4,8 @@ Bundle-SymbolicName: ${project.artifactId}
Fragment-Host: org.openhab.core.voice
-runblacklist: \
bnd.identity;id='org.osgi.service.cm'
bnd.identity;id='org.osgi.service.cm',\
bnd.identity;id='org.junit.jupiter.api'
-runrequires: \
bnd.identity;id='org.openhab.core.voice.tests'
@ -17,19 +18,18 @@ Fragment-Host: org.openhab.core.voice
org.hamcrest;version='[3.0.0,3.0.1)',\
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.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
si-units;version='[2.1.0,2.1.1)',\
si.uom.si-quantity;version='[2.1.0,2.1.1)',\
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)',\
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)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\
tech.units.indriya;version='[2.2.0,2.2.1)',\
tech.units.indriya;version='[2.2.2,2.2.3)',\
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)',\

4
tools/upgradetool/pom.xml
View File

@ -61,12 +61,12 @@
<dependency>
<groupId>si.uom</groupId>
<artifactId>si-units</artifactId>
<version>2.1</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>tech.units</groupId>
<artifactId>indriya</artifactId>
<version>2.2</version>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>