From f972e95c6b3784a3cd20e4412a84bca6eb335ee6 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Sun, 23 Mar 2025 17:03:31 +0100 Subject: [PATCH] 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 --- bom/compile/pom.xml | 4 +-- bom/runtime/pom.xml | 29 ++++++++++--------- .../org/openhab/core/library/unit/Units.java | 2 +- .../openhab/core/library/unit/UnitsTest.java | 2 +- .../openhab-tp/src/main/feature/feature.xml | 8 ++--- .../org.openhab.core.addon.tests/itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 12 ++++---- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 13 ++++----- .../itest.bndrun | 15 +++++----- .../itest.bndrun | 15 +++++----- .../itest.bndrun | 15 +++++----- .../itest.bndrun | 15 +++++----- .../itest.bndrun | 13 ++++----- itests/org.openhab.core.tests/itest.bndrun | 13 ++++----- .../org.openhab.core.thing.tests/itest.bndrun | 13 ++++----- .../org.openhab.core.voice.tests/itest.bndrun | 16 +++++----- tools/upgradetool/pom.xml | 4 +-- 30 files changed, 176 insertions(+), 195 deletions(-) diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index dd1a32587d..4e185f424e 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -212,13 +212,13 @@ si.uom si-units - 2.1 + 2.2 compile tech.units indriya - 2.2 + 2.2.2 compile diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 34a252991c..642772c2e8 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -494,13 +494,13 @@ jakarta.annotation jakarta.annotation-api - 2.0.0 + 2.1.1 compile jakarta.inject jakarta.inject-api - 2.0.0 + 2.0.1 compile @@ -513,19 +513,19 @@ org.openhab.osgiify si.uom.si-units - 2.1 + 2.2 compile si.uom si-quantity - 2.1 + 2.2 compile tech.units indriya - 2.2 + 2.2.2 compile @@ -923,37 +923,40 @@ org.glassfish.hk2 hk2-api - 2.4.0-b34 + 3.1.1 compile org.glassfish.hk2.external aopalliance-repackaged - 2.4.0-b34 + 3.1.1 compile + - org.glassfish.hk2.external - javax.inject - 2.4.0-b34 + jakarta.inject + jakarta.inject-api + 2.0.1 compile org.glassfish.hk2 hk2-locator - 2.4.0-b34 + 3.1.1 compile org.glassfish.hk2 osgi-resource-locator - 1.0.3 + 3.0.0 compile org.glassfish.hk2 hk2-utils - 2.4.0-b34 + 3.1.1 compile diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java index 40cd0b5b3e..1ddc09723e 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/Units.java @@ -170,7 +170,7 @@ public final class Units extends CustomUnits { MultiplyConverter.ofRational(BigInteger.valueOf(100000), BigInteger.ONE))); public static final Unit MILLIBAR = addUnit(MetricPrefix.MILLI(BAR)); public static final Unit BECQUEREL = addUnit(tech.units.indriya.unit.Units.BECQUEREL); - public static final Unit CURIE = addUnit(NonSI.CURIE); + public static final Unit CURIE = addUnit(BECQUEREL.multiply(37000000000L)); public static final Unit MILLI_CURIE = addUnit(MetricPrefix.MILLI(CURIE)); public static final Unit MICRO_CURIE = addUnit(MetricPrefix.MICRO(CURIE)); public static final Unit NANO_CURIE = addUnit(MetricPrefix.NANO(CURIE)); 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 1f44bfa477..21409b4357 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 @@ -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"); diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index 10922b97a5..5942ab7ef7 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -25,13 +25,13 @@ mvn:org.apache.commons/commons-lang3/3.17.0 - mvn:jakarta.annotation/jakarta.annotation-api/2.0.0 + mvn:jakarta.annotation/jakarta.annotation-api/2.1.1 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.1 - mvn:si.uom/si-quantity/2.1 - mvn:tech.units/indriya/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: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 abe30ffaab..91773294cf 100644 --- a/itests/org.openhab.core.addon.tests/itest.bndrun +++ b/itests/org.openhab.core.addon.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun index e0254ccf7b..21813e603e 100644 --- a/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun +++ b/itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.automation.integration.tests/itest.bndrun b/itests/org.openhab.core.automation.integration.tests/itest.bndrun index d8ce22a992..cbec1abb34 100644 --- a/itests/org.openhab.core.automation.integration.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.integration.tests/itest.bndrun @@ -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)',\ 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 659299584d..7c83c35ab3 100644 --- a/itests/org.openhab.core.automation.module.core.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.core.tests/itest.bndrun @@ -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)',\ 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 01a4e819f0..228b9a9335 100644 --- a/itests/org.openhab.core.automation.module.script.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.script.tests/itest.bndrun @@ -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)',\ 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 3c0c2c21be..ddf7ea6729 100644 --- a/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.module.timer.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.automation.tests/itest.bndrun b/itests/org.openhab.core.automation.tests/itest.bndrun index 564cc7b0c6..49e1930bb2 100644 --- a/itests/org.openhab.core.automation.tests/itest.bndrun +++ b/itests/org.openhab.core.automation.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun index f6614be0c3..0bd2c38554 100644 --- a/itests/org.openhab.core.config.core.tests/itest.bndrun +++ b/itests/org.openhab.core.config.core.tests/itest.bndrun @@ -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)',\ 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 3497ab9421..317d47572d 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.config.discovery.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.tests/itest.bndrun index 69ea72feb3..09a8d781be 100644 --- a/itests/org.openhab.core.config.discovery.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.tests/itest.bndrun @@ -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)',\ 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 0a5789308e..d11831d6e9 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 @@ -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)',\ 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 4bee9760b6..beac8a0fd7 100644 --- a/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun index 2de494b9b3..0443c2f81f 100644 --- a/itests/org.openhab.core.config.dispatch.tests/itest.bndrun +++ b/itests/org.openhab.core.config.dispatch.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.ephemeris.tests/itest.bndrun b/itests/org.openhab.core.ephemeris.tests/itest.bndrun index f86f197c98..24b3526280 100644 --- a/itests/org.openhab.core.ephemeris.tests/itest.bndrun +++ b/itests/org.openhab.core.ephemeris.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.io.net.tests/itest.bndrun b/itests/org.openhab.core.io.net.tests/itest.bndrun index 8bd2180ed3..7cca9893f6 100644 --- a/itests/org.openhab.core.io.net.tests/itest.bndrun +++ b/itests/org.openhab.core.io.net.tests/itest.bndrun @@ -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)',\ 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 5dd8db0cc4..016ac8f40f 100644 --- a/itests/org.openhab.core.io.rest.core.tests/itest.bndrun +++ b/itests/org.openhab.core.io.rest.core.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.model.item.tests/itest.bndrun b/itests/org.openhab.core.model.item.tests/itest.bndrun index 0e9a6eac79..cb5129cd90 100644 --- a/itests/org.openhab.core.model.item.tests/itest.bndrun +++ b/itests/org.openhab.core.model.item.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.model.rule.tests/itest.bndrun b/itests/org.openhab.core.model.rule.tests/itest.bndrun index 390dc2aec7..b2d76f7373 100644 --- a/itests/org.openhab.core.model.rule.tests/itest.bndrun +++ b/itests/org.openhab.core.model.rule.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.model.script.tests/itest.bndrun b/itests/org.openhab.core.model.script.tests/itest.bndrun index 074b45052f..35e6ef8693 100644 --- a/itests/org.openhab.core.model.script.tests/itest.bndrun +++ b/itests/org.openhab.core.model.script.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index d223b511b4..81a94dbac4 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.storage.json.tests/itest.bndrun b/itests/org.openhab.core.storage.json.tests/itest.bndrun index d08aa5ca97..41a9fc00d4 100644 --- a/itests/org.openhab.core.storage.json.tests/itest.bndrun +++ b/itests/org.openhab.core.storage.json.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.tests/itest.bndrun b/itests/org.openhab.core.tests/itest.bndrun index 3fb548f509..55986d678a 100644 --- a/itests/org.openhab.core.tests/itest.bndrun +++ b/itests/org.openhab.core.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun index 28eb48953b..6f617ef72f 100644 --- a/itests/org.openhab.core.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -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)',\ diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index b202ff1e5d..43256c20d7 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -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)',\ diff --git a/tools/upgradetool/pom.xml b/tools/upgradetool/pom.xml index 3c0e003105..003fad3262 100644 --- a/tools/upgradetool/pom.xml +++ b/tools/upgradetool/pom.xml @@ -61,12 +61,12 @@ si.uom si-units - 2.1 + 2.2 tech.units indriya - 2.2 + 2.2.2 org.eclipse.jdt