aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-01-18 14:09:28 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-01-18 14:09:28 -0800
commit9382c7d0e36f5072176f28d0534bf63297866c53 (patch)
tree82d2767a02031913538fc3efbe8f3504b3d90cc1
parent4c7383d227ea4bea29739676972416de40a19cd8 (diff)
downloadtraccar-server-9382c7d0e36f5072176f28d0534bf63297866c53.tar.gz
traccar-server-9382c7d0e36f5072176f28d0534bf63297866c53.tar.bz2
traccar-server-9382c7d0e36f5072176f28d0534bf63297866c53.zip
Update Java project files
-rw-r--r--build.gradle28
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--pom.xml28
3 files changed, 29 insertions, 29 deletions
diff --git a/build.gradle b/build.gradle
index 8e65bfdd1..b3d02ee7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
id "java"
id "checkstyle"
- id "com.google.protobuf" version "0.8.10"
+ id "com.google.protobuf" version "0.8.11"
}
repositories {
@@ -10,10 +10,10 @@ repositories {
ext {
guiceVersion = "4.2.2"
- jettyVersion = "9.4.20.v20190813"
- jerseyVersion = "2.29"
+ jettyVersion = "9.4.26.v20200117"
+ jerseyVersion = "2.30"
jacksonVersion = "2.9.9" // same version as jersey-media-json-jackson dependency
- protobufVersion = "3.11.0"
+ protobufVersion = "3.11.1"
}
sourceCompatibility = "1.8"
@@ -34,13 +34,13 @@ protobuf {
dependencies {
implementation "commons-codec:commons-codec:1.13"
- implementation "com.h2database:h2:1.4.199"
- implementation "mysql:mysql-connector-java:8.0.17"
- implementation "org.postgresql:postgresql:42.2.6"
+ implementation "com.h2database:h2:1.4.200"
+ implementation "mysql:mysql-connector-java:8.0.18"
+ implementation "org.postgresql:postgresql:42.2.9"
implementation "com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8"
- implementation "com.zaxxer:HikariCP:3.3.1"
- implementation "io.netty:netty-all:4.1.39.Final"
- implementation "org.slf4j:slf4j-jdk14:1.7.28"
+ implementation "com.zaxxer:HikariCP:3.4.2"
+ implementation "io.netty:netty-all:4.1.44.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"
@@ -56,7 +56,7 @@ 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:3.8.0", {
+ implementation "org.liquibase:liquibase-core:3.8.5", {
exclude group: "ch.qos.logback", module: "logback-classic"
}
implementation "com.sun.mail:javax.mail:1.6.2"
@@ -67,14 +67,14 @@ dependencies {
implementation "org.apache.commons:commons-collections4:4.4"
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.4.0"
- implementation "com.github.jnr:jnr-posix:3.0.50"
+ implementation "net.java.dev.jna:jna-platform:5.5.0"
+ implementation "com.github.jnr:jnr-posix:3.0.51"
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"
implementation "com.sun.xml.bind:jaxb-impl:2.3.2"
implementation "javax.activation:activation:1.1.1"
- testImplementation "junit:junit:4.12"
+ testImplementation "junit:junit:4.13"
}
task copyDependencies(type: Copy) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b8a51fe20..31a0802f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/pom.xml b/pom.xml
index 050321d7b..e6f56d465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,17 +12,17 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<guice.version>4.2.2</guice.version>
- <jetty.version>9.4.20.v20190813</jetty.version>
- <jersey.version>2.29</jersey.version>
+ <jetty.version>9.4.26.v20200117</jetty.version>
+ <jersey.version>2.30</jersey.version>
<jackson.version>2.9.9</jackson.version> <!-- same version as jersey-media-json-jackson dependency -->
- <protobuf.version>3.11.0</protobuf.version>
+ <protobuf.version>3.11.1</protobuf.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -33,17 +33,17 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.199</version>
+ <version>1.4.200</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.17</version>
+ <version>8.0.18</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.2.6</version>
+ <version>42.2.9</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
@@ -53,17 +53,17 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>3.3.1</version>
+ <version>3.4.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.39.Final</version>
+ <version>4.1.44.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <version>1.7.28</version>
+ <version>1.7.30</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
- <version>3.8.0</version>
+ <version>3.8.5</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
@@ -204,12 +204,12 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
- <version>5.4.0</version>
+ <version>5.5.0</version>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
- <version>3.0.50</version>
+ <version>3.0.51</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -246,7 +246,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.28</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>