mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
Dependency upgrades: californium, cxf, junit, swagger (#4584)
* Upgrade swagger to 2.2.28 * Upgrade swagger from 2.2.15 to 2.2.28 For changelog, see https://github.com/swagger-api/swagger-core/releases * Upgrade javassist from 3.29.2-GA to 3.30.2-GA Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> * Upgrade cxf to 3.6.5 * Upgrade cxf from 3.6.4 to 3.6.5 Find the list of relevant changes here: https://github.com/apache/cxf/blame/3.6.x-fixes/distribution/src/main/release/release_notes.txt Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> * Upgrade junit to 5.11.4 * Upgrade junit from 5.10.0 to 5.11.4 * Upgrade junit-platform-* from 1.10.0 to 1.11.4 Release notes: https://junit.org/junit5/docs/5.11.4/release-notes/ Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> * Upgrade californium to 4.0.0-M2 * Upgrade californium from 2.7.4 to 4.0.0-M2 * Replace special OH built net.i2p.crypto.eddsa by BouncyCastle * Upgrade slf4j from 2.0.12 to 2.0.16 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> * Upgrade hamcrest to 3.0 * Upgrade hamcrest from 2.2 to 3.0 Release notes: https://github.com/hamcrest/JavaHamcrest/releases/tag/v3.0 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de> --------- Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
+5
-11
@@ -17,10 +17,10 @@
|
||||
<description>The dependencies that are used to compile the core bundles</description>
|
||||
|
||||
<properties>
|
||||
<californium.version>2.7.4</californium.version>
|
||||
<californium.version>4.0.0-M2</californium.version>
|
||||
<jetty.version>9.4.57.v20241219</jetty.version>
|
||||
<pax.web.version>8.0.30</pax.web.version>
|
||||
<swagger.version>2.2.15</swagger.version>
|
||||
<swagger.version>2.2.28</swagger.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@@ -103,17 +103,11 @@
|
||||
<groupId>org.eclipse.californium</groupId>
|
||||
<artifactId>element-connector</artifactId>
|
||||
<version>${californium.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>net.i2p.crypto</groupId>
|
||||
<artifactId>eddsa</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.orbit.bundles</groupId>
|
||||
<artifactId>net.i2p.crypto.eddsa</artifactId>
|
||||
<version>0.3.0.v20220506-1020</version>
|
||||
<groupId>org.eclipse.californium</groupId>
|
||||
<artifactId>californium-osgi</artifactId>
|
||||
<version>${californium.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Gson -->
|
||||
|
||||
+18
-13
@@ -16,13 +16,14 @@
|
||||
<name>openHAB Core :: BOM :: Runtime</name>
|
||||
|
||||
<properties>
|
||||
<californium.version>2.7.4</californium.version>
|
||||
<cxf.version>3.6.4</cxf.version>
|
||||
<californium.version>4.0.0-M2</californium.version>
|
||||
<!-- cxf can be updated independently of karaf, only used in karaf tests -->
|
||||
<cxf.version>3.6.5</cxf.version>
|
||||
<jackson.version>2.18.2</jackson.version>
|
||||
<jetty.version>9.4.57.v20241219</jetty.version>
|
||||
<pax.logging.version>2.2.8</pax.logging.version>
|
||||
<pax.web.version>8.0.30</pax.web.version>
|
||||
<swagger.version>2.2.15</swagger.version>
|
||||
<swagger.version>2.2.28</swagger.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
@@ -440,17 +441,21 @@
|
||||
<groupId>org.eclipse.californium</groupId>
|
||||
<artifactId>element-connector</artifactId>
|
||||
<version>${californium.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>net.i2p.crypto</groupId>
|
||||
<artifactId>eddsa</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.orbit.bundles</groupId>
|
||||
<artifactId>net.i2p.crypto.eddsa</artifactId>
|
||||
<version>0.3.0.v20220506-1020</version>
|
||||
<groupId>org.eclipse.californium</groupId>
|
||||
<artifactId>californium-osgi</artifactId>
|
||||
<version>${californium.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jul-to-slf4j</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcprov-jdk18on</artifactId>
|
||||
<version>1.78.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Gson -->
|
||||
@@ -1058,7 +1063,7 @@
|
||||
<dependency>
|
||||
<groupId>org.javassist</groupId>
|
||||
<artifactId>javassist</artifactId>
|
||||
<version>3.29.2-GA</version>
|
||||
<version>3.30.2-GA</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
@@ -19,12 +19,17 @@
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.10.0</version>
|
||||
<version>5.11.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-launcher</artifactId>
|
||||
<version>1.10.0</version>
|
||||
<version>1.11.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-engine</artifactId>
|
||||
<version>1.11.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
|
||||
+4
-3
@@ -16,8 +16,9 @@
|
||||
<name>openHAB Core :: BOM :: Test</name>
|
||||
|
||||
<properties>
|
||||
<cxf.version>3.6.4</cxf.version>
|
||||
<junit.version>5.10.0</junit.version>
|
||||
<!-- cxf can be updated independently, karaf only uses it in tests -->
|
||||
<cxf.version>3.6.5</cxf.version>
|
||||
<junit.version>5.11.4</junit.version>
|
||||
<mockito.version>4.11.0</mockito.version>
|
||||
</properties>
|
||||
|
||||
@@ -35,7 +36,7 @@
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest</artifactId>
|
||||
<version>2.2</version>
|
||||
<version>3.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
|
||||
Reference in New Issue
Block a user