Merge tag 'v6.2'

1 files changed, 27 insertions, 23 deletions

diff --git a/build.gradle b/build.gradle
index 2fe2bfaab..029c4ae6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,13 +9,17 @@ repositories {
     mavenCentral()
 }
 
-sourceCompatibility = "11"
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
 compileJava.options.encoding = "UTF-8"
 jar.destinationDirectory = file("$projectDir/target")
 
 checkstyle {
-    toolVersion = "10.15.0"
-    configFile = "gradle/checkstyle.xml" as File
+    toolVersion = "10.17.0"
+    configFile = file("gradle/checkstyle.xml")
     checkstyleTest.enabled = false
 }
 
@@ -27,10 +31,10 @@ enforce {
 
 ext {
     guiceVersion = "7.0.0"
-    jettyVersion = "11.0.20"
-    jerseyVersion = "3.1.5"
-    jacksonVersion = "2.15.3" // same version as jersey-media-json-jackson dependency
-    protobufVersion = "4.26.1"
+    jettyVersion = "11.0.21"
+    jerseyVersion = "3.1.7"
+    jacksonVersion = "2.17.1" // same version as jersey-media-json-jackson dependency
+    protobufVersion = "4.27.0"
     jxlsVersion = "2.14.0" // version 3 requires java 17
     junitVersion = "5.10.2"
 }
@@ -42,18 +46,17 @@ protobuf {
 }
 
 dependencies {
-    implementation "commons-codec:commons-codec:1.16.1"
+    implementation "commons-codec:commons-codec:1.17.0"
     implementation "com.h2database:h2:2.2.224"
-    implementation "com.mysql:mysql-connector-j:8.3.0"
-    implementation "org.mariadb.jdbc:mariadb-java-client:3.3.3"
+    implementation "com.mysql:mysql-connector-j:8.4.0"
+    implementation "org.mariadb.jdbc:mariadb-java-client:3.4.0"
     implementation "org.postgresql:postgresql:42.7.3"
-    implementation "com.microsoft.sqlserver:mssql-jdbc:12.6.1.jre11"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:12.6.2.jre11"
     implementation "com.zaxxer:HikariCP:5.1.0"
-    implementation "io.netty:netty-all:4.1.108.Final"
-    implementation "org.slf4j:slf4j-jdk14:2.0.12"
+    implementation "io.netty:netty-all:4.1.110.Final"
+    implementation "org.slf4j:slf4j-jdk14:2.0.13"
     implementation "com.google.inject:guice:$guiceVersion"
     implementation "com.google.inject.extensions:guice-servlet:$guiceVersion"
-    implementation "org.owasp.encoder:encoder:1.2.3"
     implementation "org.glassfish:jakarta.json:2.0.1"
     implementation "com.sun.mail:jakarta.mail:2.0.1"
     implementation "org.eclipse.jetty:jetty-server:$jettyVersion"
@@ -66,7 +69,7 @@ dependencies {
     implementation "org.glassfish.jersey.containers:jersey-container-servlet:$jerseyVersion"
     implementation "org.glassfish.jersey.media:jersey-media-json-jackson:$jerseyVersion"
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion"
-    implementation "org.glassfish.hk2:guice-bridge:3.0.5" // same version as jersey-hk2
+    implementation "org.glassfish.hk2:guice-bridge:3.1.0" // same version as jersey-hk2
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jakarta-jsonp:$jacksonVersion"
     implementation "org.liquibase:liquibase-core:4.23.2" // upgrade has issues
@@ -76,23 +79,24 @@ dependencies {
     implementation "org.apache.velocity:velocity-engine-core:2.3"
     implementation "org.apache.velocity.tools:velocity-tools-generic:3.1"
     implementation "org.apache.commons:commons-collections4:4.4"
-    implementation "org.mnode.ical4j:ical4j:3.2.17"
+    implementation "org.mnode.ical4j:ical4j:3.2.18"
     implementation "org.locationtech.spatial4j:spatial4j:0.8"
     implementation "org.locationtech.jts:jts-core:1.19.0"
     implementation "net.java.dev.jna:jna-platform:5.14.0"
     implementation "com.github.jnr:jnr-posix:3.1.19"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
-    implementation "com.amazonaws:aws-java-sdk-sns:1.12.694"
+    implementation "com.amazonaws:aws-java-sdk-sns:1.12.733"
     implementation "org.apache.kafka:kafka-clients:3.7.0"
     implementation "com.hivemq:hivemq-mqtt-client:1.3.3"
-    implementation "redis.clients:jedis:5.1.2"
-    implementation "com.google.firebase:firebase-admin:9.2.0"
-    implementation "com.nimbusds:oauth2-oidc-sdk:11.10.1"
-    implementation "com.rabbitmq:amqp-client:5.20.0"
+    implementation "redis.clients:jedis:5.1.3"
+    implementation "com.google.firebase:firebase-admin:9.3.0"
+    implementation "com.nimbusds:oauth2-oidc-sdk:11.12"
+    implementation "com.rabbitmq:amqp-client:5.21.0"
     implementation "com.warrenstrange:googleauth:1.5.0"
+    implementation "com.google.openlocationcode:openlocationcode:1.0.4"
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
-    testImplementation "org.mockito:mockito-core:5.11.0"
+    testImplementation "org.mockito:mockito-core:5.12.0"
 }
 
 test {
@@ -109,7 +113,7 @@ jar {
     manifest {
         attributes(
                 "Main-Class": "org.traccar.Main",
-                "Implementation-Version": "6.0",
+                "Implementation-Version": "6.2",
                 "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" "))
     }
 }