Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Enhancement: update java dependencies versions (#2275)

Eric Bariaux151af17d0e50
diff --git a/agent/build.gradle b/agent/build.gradle
index f83e252be..467b5b3c6 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -48,8 +48,8 @@ dependencies {
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:$jacksonVersion"
implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
+ testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+ testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}
diff --git a/gradle.properties b/gradle.properties
index a5fb4adee..2b79602d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,10 +18,10 @@ undertowVersion = 2.3.18.Final
resteasyVersion = 6.2.11.Final
keycloakVersion = 25.0.3
classgraphVersion=4.8.184
-jacksonVersion = 2.20.0
+jacksonVersion = 2.20.1
groovyVersion = 4.0.24
groovySandboxVersion = 4.2.2
-sqliteVersion = 3.50.3.0
+sqliteVersion = 3.51.0.0
hibernateVersion = 6.6.11.Final
hibernateValidatorVersion = 8.0.2.Final
hikaricpVersion = 6.2.1
@@ -29,33 +29,33 @@ postgresJdbcVersion = 42.7.8
spockVersion = 2.4-M5-groovy-4.0
byteBuddyVersion = 1.16.1
objenesisVersion = 3.4
-camelVersion = 4.13.0
+camelVersion = 4.16.0
easyRulesVersion = 4.1.0
-quartzVersion= 2.5.0
-calimeroVersion = 2.6-rc1
+quartzVersion= 2.5.1
+calimeroVersion = 2.6
uuidGeneratorVersion = 5.1.1
-jSerialCommVersion = 2.11.0
-saxonHEVersion = 12.5
+jSerialCommVersion = 2.11.4
+saxonHEVersion = 12.9
exp4jVersion = 0.4.13
-nettyVersion = 4.2.6.Final
+nettyVersion = 4.2.7.Final
flywaydbVersion = 11.13.1
-ical4jVersion = 4.2.0
+ical4jVersion = 4.2.1
friendlyIdVersion = 1.0.1
-geotoolsVersion = 33.2
+geotoolsVersion = 34.0
firebaseAdminVersion = 9.7.0
jakartaMailVersion = 2.0.5
-jaywayJsonPathVersion = 2.9.0
+jaywayJsonPathVersion = 2.10.0
typescriptGeneratorVersion = 3.2.1263
-californiumCoreVersion = 3.13.0
-californiumScandiumVersion = 3.13.0
+californiumCoreVersion = 3.14.0
+californiumScandiumVersion = 3.14.0
zwaveVersion = 3.4.0
plc4xVersion = 0.12.0
niftyModbusVersion = 0.17.0
reflectionsVersion=0.10.2
-swaggerVersion=2.2.38
+swaggerVersion=2.2.40
swaggeruiVersion = 5.18.2
-hiveMQClientVersion=1.3.7
-bluetoothVersion = 0.62
+hiveMQClientVersion=1.3.10
+bluetoothVersion = 0.64
nashornVersion=15.7
failsafeVersion=3.3.2
suncalcVersion=3.11
@@ -64,10 +64,12 @@ releasesRepoUrl=https://ossrh-staging-api.central.sonatype.com/service/local/
activeMQVersion = 2.42.0
jbossLoggingManagerVersion=2.1.19.Final
greenmailVersion=2.1.2
-prometheusVersion=1.4.1
-micrometerVersion=1.15.4
+prometheusVersion=1.4.3
+micrometerVersion=1.16.0
jdomVersion = 2.0.6.1
-jSchVersion = 2.27.3
+jSchVersion = 2.27.6
bouncyCastleVersion = 1.81
victoolsJsonSchemaGeneratorVersion = 4.38.0
moquetteVersion = 0.18.0
+
+junitVersion = 5.14.1
diff --git a/model/build.gradle b/model/build.gradle
index c089651cd..47de7ed53 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -20,11 +20,6 @@ dependencies {
api "org.geotools:gt-main:$geotoolsVersion"
api "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"
- // The transitive dependency from com.jayway.jsonpath:json-path contains a vulnerability
- // https://github.com/advisories/GHSA-pq2g-wx69-c263
- // Version 2.5.2 fixes it.
- api "net.minidev:json-smart:2.5.2"
-
api "org.jeasy:easy-rules-core:$easyRulesVersion"
api "org.mnode.ical4j:ical4j:$ical4jVersion"
api "org.reflections:reflections:$reflectionsVersion"
@@ -45,11 +40,11 @@ dependencies {
dependencies {
testImplementation 'org.skyscreamer:jsonassert:1.5.3'
- testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.4'
+ testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
+ testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
testImplementation 'org.mockito:mockito-core:5.20.0'
testRuntimeOnly 'org.glassfish:jakarta.el:4.0.2'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.4'
+ testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}
}
diff --git a/model/src/test/java/org/openremote/model/util/JSONSchemaUtilTest.java b/model/src/test/java/org/openremote/model/util/JSONSchemaUtilTest.java
index 33de51eab..010c4bdfb 100644
--- a/model/src/test/java/org/openremote/model/util/JSONSchemaUtilTest.java
+++ b/model/src/test/java/org/openremote/model/util/JSONSchemaUtilTest.java
@@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.ValueSource;
import org.openremote.model.util.JSONSchemaUtil.*;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Serializable;
import java.net.URL;
import java.time.*;
@@ -27,8 +28,8 @@ public class JSONSchemaUtilTest {
ValueUtil.doInitialise();
}
- private static URL loadResource(String resourcePath) {
- return JSONSchemaUtilTest.class.getResource("/org/openremote/model/util/" + resourcePath + ".json");
+ private static InputStream loadResourceAsStream(String resourcePath) {
+ return JSONSchemaUtilTest.class.getResourceAsStream("/org/openremote/model/util/" + resourcePath + ".json");
}
static class Title {}
@@ -85,7 +86,7 @@ public class JSONSchemaUtilTest {
@Test
public void shouldRemapByte() throws IOException, JSONException {
- JsonNode expected = ValueUtil.JSON.readTree(loadResource(java.lang.Byte.class.getName()));
+ JsonNode expected = ValueUtil.JSON.readTree(loadResourceAsStream(java.lang.Byte.class.getName()));
JsonNode actual = ValueUtil.getSchema(java.lang.Byte.class);
assertEquals(expected.toString(), actual.toString(), true);
}
@@ -150,7 +151,7 @@ public class JSONSchemaUtilTest {
org.openremote.model.value.ValueType.MultivaluedStringMap.class,
})
public void shouldHandleMapTypes() throws IOException, JSONException {
- JsonNode expected = ValueUtil.JSON.readTree(loadResource(java.lang.Byte.class.getName()));
+ JsonNode expected = ValueUtil.JSON.readTree(loadResourceAsStream(java.lang.Byte.class.getName()));
JsonNode actual = ValueUtil.getSchema(java.lang.Byte.class);
assertEquals(expected.toString(), actual.toString(), true);
}
diff --git a/project.gradle b/project.gradle
index 361aae9dd..ef57b1d80 100644
--- a/project.gradle
+++ b/project.gradle
@@ -171,8 +171,8 @@ repositories {
maven {
url = "https://repo.osgeo.org/repository/release/"
content {
- includeGroup "javax.media"
includeGroup "it.geosolutions.jgridshift"
+ includeGroup "org.eclipse.imagen"
includeGroupByRegex "org\\.geotools.*"
}
}