demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Holger Friedrich
2025-03-23 17:03:31 +01:00
committed by GitHub
parent 328aa7e4a5
commit f972e95c6b
30 changed files with 176 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/karaf/openhab-tp/src/main/feature/feature.xml
+4 -4
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>