aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-11-27 15:32:12 -0800
committerAnton Tananaev <anton@traccar.org>2022-11-27 15:32:12 -0800
commit82cd47bf236808d4ef13b5c654ed5b52ed2746bb (patch)
tree62cb4f133e401aeb99dd93508c11a1cf78b62c97
parent20ca33bf17c30bf2335d85365a224bc437e0347b (diff)
downloadtrackermap-server-82cd47bf236808d4ef13b5c654ed5b52ed2746bb.tar.gz
trackermap-server-82cd47bf236808d4ef13b5c654ed5b52ed2746bb.tar.bz2
trackermap-server-82cd47bf236808d4ef13b5c654ed5b52ed2746bb.zip
Update java versions
-rw-r--r--build.gradle24
-rw-r--r--src/main/java/org/traccar/storage/DatabaseModule.java4
2 files changed, 14 insertions, 14 deletions
diff --git a/build.gradle b/build.gradle
index a5daf5924..3dcef5a8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ ext {
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.7"
+ protobufVersion = "3.21.9"
}
sourceCompatibility = "11"
@@ -42,16 +42,16 @@ enforce {
dependencies {
implementation "commons-codec:commons-codec:1.15"
implementation "com.h2database:h2:2.1.214"
- implementation "mysql:mysql-connector-java:8.0.30"
- implementation "org.postgresql:postgresql:42.5.0"
+ 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.82.Final"
- implementation "org.slf4j:slf4j-jdk14:2.0.3"
+ 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-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"
@@ -65,26 +65,26 @@ dependencies {
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.16.1"
- 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" // 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.2.5"
+ implementation "org.mnode.ical4j:ical4j:3.2.7"
implementation "org.locationtech.spatial4j:spatial4j:0.8"
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.15"
+ 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" // 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.314"
+ implementation "com.amazonaws:aws-java-sdk-sns:1.12.349"
implementation "org.apache.kafka:kafka-clients:3.3.1"
- implementation ("com.google.firebase:firebase-admin:9.0.0") {
+ implementation ("com.google.firebase:firebase-admin:9.1.1") {
exclude group: 'com.google.cloud', module: 'google-cloud-firestore'
}
testImplementation "junit:junit:4.13.2"
diff --git a/src/main/java/org/traccar/storage/DatabaseModule.java b/src/main/java/org/traccar/storage/DatabaseModule.java
index 71bf84b34..3e3483818 100644
--- a/src/main/java/org/traccar/storage/DatabaseModule.java
+++ b/src/main/java/org/traccar/storage/DatabaseModule.java
@@ -24,7 +24,7 @@ import liquibase.Liquibase;
import liquibase.database.Database;
import liquibase.database.DatabaseFactory;
import liquibase.exception.LiquibaseException;
-import liquibase.resource.FileSystemResourceAccessor;
+import liquibase.resource.DirectoryResourceAccessor;
import liquibase.resource.ResourceAccessor;
import org.traccar.config.Config;
import org.traccar.config.Keys;
@@ -80,7 +80,7 @@ public class DatabaseModule extends AbstractModule {
if (config.hasKey(Keys.DATABASE_CHANGELOG)) {
- ResourceAccessor resourceAccessor = new FileSystemResourceAccessor(new File("."));
+ ResourceAccessor resourceAccessor = new DirectoryResourceAccessor(new File("."));
Database database = DatabaseFactory.getInstance().openDatabase(
config.getString(Keys.DATABASE_URL),