Update Java libraries

2 files changed, 26 insertions, 24 deletions

diff --git a/build.gradle b/build.gradle
index 155a893a5..3043e8572 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,22 +16,23 @@ checkstyle {
 }
 
 ext {
-    jettyVersion = "9.4.14.v20181114"
+    guiceVersion = "4.2.2"
+    jettyVersion = "9.4.17.v20190418"
     jerseyVersion = "2.28"
     jacksonVersion = "2.9.8"
 }
 
 dependencies {
-    implementation "commons-codec:commons-codec:1.11"
-    implementation "com.h2database:h2:1.4.197"
-    implementation "mysql:mysql-connector-java:5.1.47" // bug should be fixed in 8.0.13
+    implementation "commons-codec:commons-codec:1.12"
+    implementation "com.h2database:h2:1.4.199"
+    implementation "mysql:mysql-connector-java:8.0.15"
     implementation "org.postgresql:postgresql:42.2.5"
-    implementation "com.microsoft.sqlserver:mssql-jdbc:7.2.0.jre8"
-    implementation "com.zaxxer:HikariCP:3.3.0"
-    implementation "io.netty:netty-all:4.1.33.Final"
-    implementation "org.slf4j:slf4j-jdk14:1.7.25"
-    implementation "com.google.inject:guice:4.2.2"
-    implementation "com.google.inject.extensions:guice-assistedinject:4.2.2"
+    implementation "com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8"
+    implementation "com.zaxxer:HikariCP:3.3.1"
+    implementation "io.netty:netty-all:4.1.35.Final"
+    implementation "org.slf4j:slf4j-jdk14:1.7.26"
+    implementation "com.google.inject:guice:$guiceVersion"
+    implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion"
     implementation "org.owasp.encoder:encoder:1.2.2"
     implementation "org.glassfish:javax.json:1.1.4"
     implementation "org.eclipse.jetty:jetty-server:$jettyVersion"
@@ -54,7 +55,7 @@ dependencies {
     implementation "org.apache.commons:commons-collections4:4.2"
     implementation "org.mnode.ical4j:ical4j:2.0.5" // needs upgrade
     implementation "com.fizzed:ch-smpp:6.0.0-netty4-beta-3"
-    implementation "net.java.dev.jna:jna-platform:5.2.0"
+    implementation "net.java.dev.jna:jna-platform:5.3.1"
     implementation "com.github.jnr:jnr-posix:3.0.49"
     implementation "javax.xml.bind:jaxb-api:2.3.1"
     implementation "com.sun.xml.bind:jaxb-core:2.3.0.1"
@@ -77,7 +78,7 @@ jar {
     manifest {
         attributes(
                 "Main-Class": "org.traccar.Main",
-                "Implementation-Version": "4.3",
+                "Implementation-Version": "4.4",
                 "Class-Path": configurations.runtimeClasspath.files.collect { "lib/$it.name" }.join(" "))
     }
 }
diff --git a/pom.xml b/pom.xml
index b9f5965f7..06b7eabd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.traccar</groupId>
     <artifactId>traccar</artifactId>
-    <version>4.3-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
 
     <name>traccar</name>
     <url>https://www.traccar.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>9.4.14.v20181114</jetty.version>
+        <guice.version>4.2.2</guice.version>
+        <jetty.version>9.4.17.v20190418</jetty.version>
         <jersey.version>2.28</jersey.version>
         <jackson.version>2.9.8</jackson.version> <!-- same version as jersey-media-json-jackson dependency -->
     </properties>
@@ -26,17 +27,17 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.11</version>
+            <version>1.12</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.197</version>
+            <version>1.4.199</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.47</version> <!-- bug should be fixed in 8.0.13 -->
+            <version>8.0.15</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -46,32 +47,32 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>7.2.0.jre8</version>
+            <version>7.2.2.jre8</version>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.33.Final</version>
+            <version>4.1.35.Final</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.26</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>4.2.2</version>
+            <version>${guice.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-assistedinject</artifactId>
-            <version>4.2.2</version>
+            <version>${guice.version}</version>
         </dependency>
         <dependency>
             <groupId>org.owasp.encoder</groupId>
@@ -192,7 +193,7 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>
-            <version>5.2.0</version>
+            <version>5.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.jnr</groupId>