Update java dependencies

2 files changed, 41 insertions, 26 deletions

diff --git a/build.gradle b/build.gradle
index d00c7af8f..ea6024159 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,10 +11,10 @@ repositories {
 
 ext {
     guiceVersion = "4.2.3"
-    jettyVersion = "9.4.33.v20201020"
-    jerseyVersion = "2.32"
-    jacksonVersion = "2.10.1" // same version as jersey-media-json-jackson dependency
-    protobufVersion = "3.13.0"
+    jettyVersion = "9.4.36.v20210114" // jetty 10 requires java 11, jetty 11 javax to jakarta
+    jerseyVersion = "2.33" // jersey 3 javax to jakarta
+    jacksonVersion = "2.12.1" // same version as jersey-media-json-jackson dependency
+    protobufVersion = "3.14.0"
 }
 
 sourceCompatibility = "1.8"
@@ -37,28 +37,28 @@ protobuf {
 dependencies {
     implementation "commons-codec:commons-codec:1.15"
     implementation "com.h2database:h2:1.4.200"
-    implementation "mysql:mysql-connector-java:8.0.22"
+    implementation "mysql:mysql-connector-java:8.0.23"
     implementation "org.postgresql:postgresql:42.2.18"
-    implementation "com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8"
-    implementation "com.zaxxer:HikariCP:3.4.5"
-    implementation "io.netty:netty-all:4.1.53.Final"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:9.2.0.jre8"
+    implementation "com.zaxxer:HikariCP:4.0.1"
+    implementation "io.netty:netty-all:4.1.58.Final"
     implementation "org.slf4j:slf4j-jdk14:1.7.30"
     implementation "com.google.inject:guice:$guiceVersion"
     implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion"
-    implementation "org.owasp.encoder:encoder:1.2.2"
+    implementation "org.owasp.encoder:encoder:1.2.3"
     implementation "org.glassfish:javax.json:1.1.4"
     implementation "org.eclipse.jetty:jetty-server:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-servlet:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-webapp:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-jndi:$jettyVersion"
     implementation "org.eclipse.jetty:jetty-proxy:$jettyVersion"
-    implementation "org.eclipse.jetty.websocket:websocket-server:$jettyVersion"
+    implementation "org.eclipse.jetty.websocket:websocket-server:$jettyVersion" // websocket-jetty-server from jetty 10
     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 "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jacksonVersion"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr353:$jacksonVersion"
-    implementation "org.liquibase:liquibase-core:3.10.3", {
+    implementation "org.liquibase:liquibase-core:3.10.3", { // needs upgrade
         exclude group: "ch.qos.logback", module: "logback-classic"
     }
     implementation "com.sun.mail:javax.mail:1.6.2"
@@ -68,10 +68,10 @@ dependencies {
     implementation "org.apache.velocity:velocity-tools:2.0"
     implementation "org.apache.commons:commons-collections4:4.4"
     implementation "org.mnode.ical4j:ical4j:2.0.5" // needs upgrade
-    implementation "org.locationtech.spatial4j:spatial4j:0.7"
-    implementation "org.locationtech.jts:jts-core:1.17.1"
+    implementation "org.locationtech.spatial4j:spatial4j:0.8"
+    implementation "org.locationtech.jts:jts-core:1.18.0"
     implementation "net.java.dev.jna:jna-platform:5.6.0"
-    implementation "com.github.jnr:jnr-posix:3.1.2"
+    implementation "com.github.jnr:jnr-posix:3.1.4"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     implementation "javax.xml.bind:jaxb-api:2.3.1"
     implementation "com.sun.xml.bind:jaxb-core:2.3.0.1"
diff --git a/pom.xml b/pom.xml
index eec5c5f69..db83314e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <guice.version>4.2.3</guice.version>
-        <jetty.version>9.4.33.v20201020</jetty.version>
-        <jersey.version>2.32</jersey.version>
-        <jackson.version>2.10.1</jackson.version> <!-- same version as jersey-media-json-jackson dependency -->
-        <protobuf.version>3.13.0</protobuf.version>
+        <jetty.version>9.4.36.v20210114</jetty.version>
+        <jersey.version>2.33</jersey.version>
+        <jackson.version>2.12.1</jackson.version> <!-- same version as jersey-media-json-jackson dependency -->
+        <protobuf.version>3.14.0</protobuf.version>
     </properties>
 
     <dependencies>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.22</version>
+            <version>8.0.23</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -48,17 +48,17 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>8.4.1.jre8</version>
+            <version>9.2.0.jre8</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.4.5</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.53.Final</version>
+            <version>4.1.58.Final</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.owasp.encoder</groupId>
             <artifactId>encoder</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
@@ -189,12 +189,12 @@
         <dependency>
             <groupId>org.locationtech.spatial4j</groupId>
             <artifactId>spatial4j</artifactId>
-            <version>0.7</version>
+            <version>0.8</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
-            <version>1.17.1</version>
+            <version>1.18.0</version>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>com.github.jnr</groupId>
             <artifactId>jnr-posix</artifactId>
-            <version>3.1.2</version>
+            <version>3.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -248,6 +248,21 @@
             <artifactId>jakarta.activation-api</artifactId>
             <version>1.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>2.12.1</version>
+        </dependency>
 
     </dependencies>