Merge branch 'master' into develop

1 files changed, 38 insertions, 30 deletions

diff --git a/build.gradle b/build.gradle
index d9c70fc15..91ba2cd5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id "java"
     id "checkstyle"
-    id "com.google.protobuf" version "0.8.16"
-    id "org.kordamp.gradle.project-enforcer" version "0.9.0"
+    id "com.google.protobuf" version "0.8.19"
+    id "org.kordamp.gradle.project-enforcer" version "0.10.0"
 }
 
 repositories {
@@ -10,11 +10,11 @@ repositories {
 }
 
 ext {
-    guiceVersion = "5.0.1"
-    jettyVersion = "10.0.6" // jetty 11 javax to jakarta
-    jerseyVersion = "2.34" // jersey 3 javax to jakarta
-    jacksonVersion = "2.12.2" // same version as jersey-media-json-jackson dependency
-    protobufVersion = "3.17.3"
+    guiceVersion = "5.1.0"
+    jettyVersion = "10.0.12" // jetty 11 javax to jakarta
+    jerseyVersion = "2.37" // jersey 3 javax to jakarta
+    jacksonVersion = "2.13.4" // same version as jersey-media-json-jackson dependency
+    protobufVersion = "3.21.9"
 }
 
 sourceCompatibility = "11"
@@ -22,13 +22,12 @@ compileJava.options.encoding = "UTF-8"
 jar.destinationDirectory = file("$projectDir/target")
 
 checkstyle {
-    toolVersion = "8.26"
+    toolVersion = "10.3.4"
     configFile = "gradle/checkstyle.xml" as File
     checkstyleTest.enabled = false
 }
 
 protobuf {
-    generatedFilesBaseDir = "$projectDir/src"
     protoc {
         artifact = "com.google.protobuf:protoc:$protobufVersion"
     }
@@ -42,19 +41,20 @@ enforce {
 
 dependencies {
     implementation "commons-codec:commons-codec:1.15"
-    implementation "com.h2database:h2:1.4.200"
-    implementation "mysql:mysql-connector-java:8.0.26"
-    implementation "org.postgresql:postgresql:42.2.23"
-    implementation "com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre11"
-    implementation "com.zaxxer:HikariCP:5.0.0"
-    implementation "io.netty:netty-all:4.1.66.Final"
-    implementation "org.slf4j:slf4j-jdk14:2.0.0-alpha4"
+    implementation "com.h2database:h2:2.1.214"
+    implementation "com.mysql:mysql-connector-j:8.0.31"
+    implementation "org.postgresql:postgresql:42.5.1"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre11"
+    implementation "com.zaxxer:HikariCP:5.0.1"
+    implementation "io.netty:netty-all:4.1.85.Final"
+    implementation "org.slf4j:slf4j-jdk14:2.0.5"
     implementation "com.google.inject:guice:$guiceVersion"
-    implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion"
+    implementation "com.google.inject.extensions:guice-servlet:$guiceVersion"
     implementation "org.owasp.encoder:encoder:1.2.3"
-    implementation "org.glassfish:javax.json:1.1.4"
+    implementation "org.glassfish:jakarta.json:1.1.6"
     implementation "org.eclipse.jetty:jetty-server:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-servlet:$jettyVersion"
+    implementation "org.eclipse.jetty:jetty-servlets:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-webapp:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-jndi:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-proxy:$jettyVersion"
@@ -62,27 +62,35 @@ 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:2.6.1" // same version as jersey-hk2
     implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr353:$jacksonVersion"
-    implementation "org.liquibase:liquibase-core:4.4.3"
-    implementation "com.sun.mail:javax.mail:1.6.2"
+    implementation "org.liquibase:liquibase-core:4.17.2"
+    implementation "com.sun.mail:jakarta.mail:1.6.7"
     implementation "org.jxls:jxls:2.4.7" // needs upgrade (wait for jexl 4)
     implementation "org.jxls:jxls-poi:1.0.16" // needs upgrade (wait for jexl 4)
-    implementation "org.apache.velocity:velocity:1.7"
-    implementation "org.apache.velocity:velocity-tools:2.0"
+    implementation "org.apache.velocity:velocity:1.7" // needs upgrade
+    implementation "org.apache.velocity:velocity-tools:2.0" // needs upgrade
     implementation "org.apache.commons:commons-collections4:4.4"
-    implementation "org.mnode.ical4j:ical4j:3.0.29"
+    implementation "org.mnode.ical4j:ical4j:3.2.7"
     implementation "org.locationtech.spatial4j:spatial4j:0.8"
-    implementation "org.locationtech.jts:jts-core:1.18.1"
-    implementation "net.java.dev.jna:jna-platform:5.8.0"
-    implementation "com.github.jnr:jnr-posix:3.1.7"
+    implementation "org.locationtech.jts:jts-core:1.19.0"
+    implementation "net.java.dev.jna:jna-platform:5.12.1"
+    implementation "com.github.jnr:jnr-posix:3.1.16"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     implementation "javax.xml.bind:jaxb-api:2.3.1"
-    implementation "com.sun.xml.bind:jaxb-core:3.0.2"
-    implementation "com.sun.xml.bind:jaxb-impl:3.0.2"
+    implementation "com.sun.xml.bind:jaxb-core:3.0.2" // needs upgrade
+    implementation "com.sun.xml.bind:jaxb-impl:3.0.2" // needs upgrade
     implementation "javax.activation:activation:1.1.1"
-    implementation 'com.amazonaws:aws-java-sdk-sns:1.12.47'
+    implementation "com.amazonaws:aws-java-sdk-sns:1.12.349"
+    implementation "org.apache.kafka:kafka-clients:3.3.1"
+    implementation 'com.hivemq:hivemq-mqtt-client:1.3.0'
+    implementation("com.google.firebase:firebase-admin:9.1.1") {
+        exclude group: 'com.google.cloud', module: 'google-cloud-firestore'
+        exclude group: 'com.google.cloud', module: 'google-cloud-storage'
+    }
     testImplementation "junit:junit:4.13.2"
+    testImplementation "org.mockito:mockito-core:4.+"
 }
 
 task copyDependencies(type: Copy) {
@@ -95,7 +103,7 @@ jar {
     manifest {
         attributes(
                 "Main-Class": "org.traccar.Main",
-                "Implementation-Version": "4.14",
+                "Implementation-Version": "5.5",
                 "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" "))
     }
 }