Merge tag 'tags/v6.3'

1 files changed, 20 insertions, 19 deletions

diff --git a/build.gradle b/build.gradle
index 029c4ae6d..9786c8458 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ repositories {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 compileJava.options.encoding = "UTF-8"
@@ -24,8 +24,9 @@ checkstyle {
 }
 
 enforce {
+    // noinspection UnnecessaryQualifiedReference
     rule(enforcer.rules.EnforceBytecodeVersion) { r ->
-        r.maxJdkVersion = "11"
+        r.maxJdkVersion = "17"
     }
 }
 
@@ -33,10 +34,10 @@ ext {
     guiceVersion = "7.0.0"
     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"
+    jacksonVersion = "2.17.2" // same version as jersey-media-json-jackson dependency
+    protobufVersion = "4.27.2"
+    jxlsVersion = "2.14.0" // version 3 has breaking changes
+    junitVersion = "5.10.3"
 }
 
 protobuf {
@@ -46,14 +47,14 @@ protobuf {
 }
 
 dependencies {
-    implementation "commons-codec:commons-codec:1.17.0"
-    implementation "com.h2database:h2:2.2.224"
-    implementation "com.mysql:mysql-connector-j:8.4.0"
-    implementation "org.mariadb.jdbc:mariadb-java-client:3.4.0"
+    implementation "commons-codec:commons-codec:1.17.1"
+    implementation "com.h2database:h2:2.3.230"
+    implementation "com.mysql:mysql-connector-j:9.0.0"
+    implementation "org.mariadb.jdbc:mariadb-java-client:3.4.1"
     implementation "org.postgresql:postgresql:42.7.3"
-    implementation "com.microsoft.sqlserver:mssql-jdbc:12.6.2.jre11"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:12.6.3.jre11"
     implementation "com.zaxxer:HikariCP:5.1.0"
-    implementation "io.netty:netty-all:4.1.110.Final"
+    implementation "io.netty:netty-all:4.1.112.Final"
     implementation "org.slf4j:slf4j-jdk14:2.0.13"
     implementation "com.google.inject:guice:$guiceVersion"
     implementation "com.google.inject.extensions:guice-servlet:$guiceVersion"
@@ -73,24 +74,24 @@ dependencies {
     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
-    implementation "org.apache.commons:commons-jexl3:3.3"
+    implementation "org.apache.commons:commons-jexl3:3.4.0"
     implementation "org.jxls:jxls:$jxlsVersion"
     implementation "org.jxls:jxls-poi:$jxlsVersion"
     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.18"
+    implementation "org.mnode.ical4j:ical4j:4.0.2"
     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.733"
-    implementation "org.apache.kafka:kafka-clients:3.7.0"
+    implementation "com.amazonaws:aws-java-sdk-sns:1.12.765"
+    implementation "org.apache.kafka:kafka-clients:3.8.0"
     implementation "com.hivemq:hivemq-mqtt-client:1.3.3"
     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.nimbusds:oauth2-oidc-sdk:11.13"
     implementation "com.rabbitmq:amqp-client:5.21.0"
     implementation "com.warrenstrange:googleauth:1.5.0"
     implementation "com.google.openlocationcode:openlocationcode:1.0.4"
@@ -113,7 +114,7 @@ jar {
     manifest {
         attributes(
                 "Main-Class": "org.traccar.Main",
-                "Implementation-Version": "6.2",
+                "Implementation-Version": "6.3",
                 "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" "))
     }
 }