From 3c5af6affc37ae0833e5d0560d86f85d60abf42e Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 17 Jan 2022 18:59:55 -0800
Subject: Update Java libraries

---
 build.gradle                                  | 34 +++++++++++++--------------
 src/main/java/org/traccar/model/Calendar.java |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index d9c70fc15..b7ce624c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "java"
     id "checkstyle"
-    id "com.google.protobuf" version "0.8.16"
+    id "com.google.protobuf" version "0.8.18"
     id "org.kordamp.gradle.project-enforcer" version "0.9.0"
 }
 
@@ -11,10 +11,10 @@ repositories {
 
 ext {
     guiceVersion = "5.0.1"
-    jettyVersion = "10.0.6" // jetty 11 javax to jakarta
-    jerseyVersion = "2.34" // jersey 3 javax to jakarta
+    jettyVersion = "10.0.7" // jetty 11 javax to jakarta
+    jerseyVersion = "2.35" // jersey 3 javax to jakarta
     jacksonVersion = "2.12.2" // same version as jersey-media-json-jackson dependency
-    protobufVersion = "3.17.3"
+    protobufVersion = "3.19.3"
 }
 
 sourceCompatibility = "11"
@@ -22,7 +22,7 @@ compileJava.options.encoding = "UTF-8"
 jar.destinationDirectory = file("$projectDir/target")
 
 checkstyle {
-    toolVersion = "8.26"
+    toolVersion = "9.2.1"
     configFile = "gradle/checkstyle.xml" as File
     checkstyleTest.enabled = false
 }
@@ -42,13 +42,13 @@ 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 "com.h2database:h2:2.0.206"
+    implementation "mysql:mysql-connector-java:8.0.27"
+    implementation "org.postgresql:postgresql:42.3.1"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre11"
+    implementation "com.zaxxer:HikariCP:5.0.1"
     implementation "io.netty:netty-all:4.1.66.Final"
-    implementation "org.slf4j:slf4j-jdk14:2.0.0-alpha4"
+    implementation "org.slf4j:slf4j-jdk14:2.0.0-alpha6"
     implementation "com.google.inject:guice:$guiceVersion"
     implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion"
     implementation "org.owasp.encoder:encoder:1.2.3"
@@ -64,24 +64,24 @@ dependencies {
     implementation "org.glassfish.jersey.inject:jersey-hk2:$jerseyVersion"
     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 "org.liquibase:liquibase-core:4.7.0"
     implementation "com.sun.mail:javax.mail:1.6.2"
     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.commons:commons-collections4:4.4"
-    implementation "org.mnode.ical4j:ical4j:3.0.29"
+    implementation "org.mnode.ical4j:ical4j:3.1.2"
     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.18.2"
+    implementation "net.java.dev.jna:jna-platform:5.10.0"
+    implementation "com.github.jnr:jnr-posix:3.1.15"
     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 "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.141"
     testImplementation "junit:junit:4.13.2"
 }
 
diff --git a/src/main/java/org/traccar/model/Calendar.java b/src/main/java/org/traccar/model/Calendar.java
index 1010325b6..0b45ca6c8 100644
--- a/src/main/java/org/traccar/model/Calendar.java
+++ b/src/main/java/org/traccar/model/Calendar.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import net.fortuna.ical4j.data.CalendarBuilder;
 import net.fortuna.ical4j.data.ParserException;
 import net.fortuna.ical4j.filter.Filter;
-import net.fortuna.ical4j.filter.PeriodRule;
+import net.fortuna.ical4j.filter.predicate.PeriodRule;
 import net.fortuna.ical4j.model.DateTime;
 import net.fortuna.ical4j.model.Period;
 import net.fortuna.ical4j.model.component.CalendarComponent;
-- 
cgit v1.2.3