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
bom/compile/pom.xml
+2 -2
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>
bom/runtime/pom.xml
+16 -13
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>