From 0e006ec6f5cc9a0b7853f093b041ac55e88dcb85 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 5 Apr 2024 18:13:33 -0700 Subject: Update Java dependencies --- build.gradle | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 3677f8f94..d61856c1b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import enforcer.rules.EnforceBytecodeVersion + plugins { id "java" id "checkstyle" @@ -14,25 +16,25 @@ compileJava.options.encoding = "UTF-8" jar.destinationDirectory = file("$projectDir/target") checkstyle { - toolVersion = "10.12.5" + toolVersion = "10.15.0" configFile = "gradle/checkstyle.xml" as File checkstyleTest.enabled = false } enforce { - rule(enforcer.rules.EnforceBytecodeVersion) { r -> + rule(EnforceBytecodeVersion) { r -> r.maxJdkVersion = "11" } } ext { guiceVersion = "7.0.0" - jettyVersion = "11.0.19" + jettyVersion = "11.0.20" jerseyVersion = "3.1.5" jacksonVersion = "2.15.3" // same version as jersey-media-json-jackson dependency - protobufVersion = "3.25.2" - jxlsVersion = "2.14.0" - junitVersion = "5.10.1" + protobufVersion = "4.26.1" + jxlsVersion = "2.14.0" // version 3 requires java 17 + junitVersion = "5.10.2" } protobuf { @@ -42,15 +44,15 @@ protobuf { } dependencies { - implementation "commons-codec:commons-codec:1.16.0" + implementation "commons-codec:commons-codec:1.16.1" implementation "com.h2database:h2:2.2.224" - implementation "com.mysql:mysql-connector-j:8.2.0" - implementation "org.mariadb.jdbc:mariadb-java-client:3.3.2" - implementation "org.postgresql:postgresql:42.7.1" - implementation "com.microsoft.sqlserver:mssql-jdbc:12.4.2.jre11" + implementation "com.mysql:mysql-connector-j:8.3.0" + implementation "org.mariadb.jdbc:mariadb-java-client:3.3.3" + implementation "org.postgresql:postgresql:42.7.3" + implementation "com.microsoft.sqlserver:mssql-jdbc:12.6.1.jre11" implementation "com.zaxxer:HikariCP:5.1.0" - implementation "io.netty:netty-all:4.1.104.Final" - implementation "org.slf4j:slf4j-jdk14:2.0.11" + implementation "io.netty:netty-all:4.1.108.Final" + implementation "org.slf4j:slf4j-jdk14:2.0.12" implementation "com.google.inject:guice:$guiceVersion" implementation "com.google.inject.extensions:guice-servlet:$guiceVersion" implementation "org.owasp.encoder:encoder:1.2.3" @@ -76,30 +78,30 @@ 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.14" + implementation "org.mnode.ical4j:ical4j:3.2.17" 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.18" + 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.636" - implementation "org.apache.kafka:kafka-clients:3.6.1" + implementation "com.amazonaws:aws-java-sdk-sns:1.12.694" + implementation "org.apache.kafka:kafka-clients:3.7.0" implementation "com.hivemq:hivemq-mqtt-client:1.3.3" - implementation "redis.clients:jedis:5.1.0" + implementation "redis.clients:jedis:5.1.2" implementation "com.google.firebase:firebase-admin:9.2.0" - implementation "com.nimbusds:oauth2-oidc-sdk:11.9.1" + implementation "com.nimbusds:oauth2-oidc-sdk:11.10.1" implementation "com.rabbitmq:amqp-client:5.20.0" implementation "com.warrenstrange:googleauth:1.5.0" testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion" - testImplementation "org.mockito:mockito-core:5.8.0" + testImplementation "org.mockito:mockito-core:5.11.0" } test { useJUnitPlatform() } -task copyDependencies(type: Copy) { +tasks.register('copyDependencies', Copy) { into "$projectDir/target/lib" from configurations.runtimeClasspath } -- cgit v1.2.3 From fca91e1347f48704093412d1b0218e2fcd7ce34b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 5 Apr 2024 18:16:09 -0700 Subject: Remove gradle import --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index d61856c1b..ac154b345 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import enforcer.rules.EnforceBytecodeVersion - plugins { id "java" id "checkstyle" @@ -22,7 +20,7 @@ checkstyle { } enforce { - rule(EnforceBytecodeVersion) { r -> + rule(enforcer.rules.EnforceBytecodeVersion) { r -> r.maxJdkVersion = "11" } } -- cgit v1.2.3 From 3454f5b8b580ef7aee121ed2d7821db7161e1bd9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 6 Apr 2024 09:55:09 -0700 Subject: Update version number --- build.gradle | 2 +- setup/traccar.iss | 2 +- swagger.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index ac154b345..2fe2bfaab 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ jar { manifest { attributes( "Main-Class": "org.traccar.Main", - "Implementation-Version": "5.12", + "Implementation-Version": "6.0", "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" ")) } } diff --git a/setup/traccar.iss b/setup/traccar.iss index 2ccee1c3e..466a40c30 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=5.12 +AppVersion=6.0 DefaultDirName={pf}\Traccar OutputBaseFilename=traccar-setup ArchitecturesInstallIn64BitMode=x64 diff --git a/swagger.json b/swagger.json index b2209a20e..933652cb0 100644 --- a/swagger.json +++ b/swagger.json @@ -2,7 +2,7 @@ "openapi": "3.0.1", "info": { "title": "Traccar", - "version": "5.12", + "version": "6.0", "description": "Traccar GPS tracking server API documentation. To use the API you need to have a server instance. For testing purposes you can use one of free [demo servers](https://www.traccar.org/demo-server/). For production use you can install your own server or get a [subscription service](https://www.traccar.org/product/tracking-server/).", "contact": { "name": "Traccar Support", -- cgit v1.2.3