aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-07-05 18:53:59 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-07-05 18:53:59 -0700
commitf7c59bfae02644609867997c5f0ef04e71fe7497 (patch)
tree235cba6c12a4af23983f0c4d4dba9b0c594692b7
parent3f2f509a472050f1f538240aee911308325af32c (diff)
downloadtrackermap-server-f7c59bfae02644609867997c5f0ef04e71fe7497.tar.gz
trackermap-server-f7c59bfae02644609867997c5f0ef04e71fe7497.tar.bz2
trackermap-server-f7c59bfae02644609867997c5f0ef04e71fe7497.zip
Update Java dependencies
-rw-r--r--build.gradle30
-rw-r--r--pom.xml48
2 files changed, 37 insertions, 41 deletions
diff --git a/build.gradle b/build.gradle
index ec0a87356..5fb3efbca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
id "java"
id "checkstyle"
- id "com.google.protobuf" version "0.8.11"
+ id "com.google.protobuf" version "0.8.12"
id "application"
}
@@ -10,11 +10,11 @@ repositories {
}
ext {
- guiceVersion = "4.2.2"
- jettyVersion = "9.4.26.v20200117"
- jerseyVersion = "2.30"
- jacksonVersion = "2.9.9" // same version as jersey-media-json-jackson dependency
- protobufVersion = "3.11.1"
+ guiceVersion = "4.2.3"
+ jettyVersion = "9.4.30.v20200611"
+ jerseyVersion = "2.31"
+ jacksonVersion = "2.10.1" // same version as jersey-media-json-jackson dependency
+ protobufVersion = "3.12.2"
}
sourceCompatibility = "1.8"
@@ -35,13 +35,13 @@ protobuf {
}
dependencies {
- implementation "commons-codec:commons-codec:1.13"
+ implementation "commons-codec:commons-codec:1.14"
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.4.2"
- implementation "io.netty:netty-all:4.1.44.Final"
+ implementation "mysql:mysql-connector-java:8.0.20"
+ implementation "org.postgresql:postgresql:42.2.14"
+ implementation "com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8"
+ implementation "com.zaxxer:HikariCP:3.4.5"
+ implementation "io.netty:netty-all:4.1.50.Final"
implementation "org.slf4j:slf4j-jdk14:1.7.30"
implementation "com.google.inject:guice:$guiceVersion"
implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion"
@@ -58,7 +58,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.5", {
+ implementation "org.liquibase:liquibase-core:3.10.1", {
exclude group: "ch.qos.logback", module: "logback-classic"
}
implementation "com.sun.mail:javax.mail:1.6.2"
@@ -70,11 +70,11 @@ dependencies {
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.5.0"
- implementation "com.github.jnr:jnr-posix:3.0.51"
+ implementation "com.github.jnr:jnr-posix:3.0.57"
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 "com.sun.xml.bind:jaxb-impl:2.3.3"
implementation "javax.activation:activation:1.1.1"
testImplementation "junit:junit:4.13"
}
diff --git a/pom.xml b/pom.xml
index 535a20e6d..90e32b016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <guice.version>4.2.2</guice.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.1</protobuf.version>
+ <guice.version>4.2.3</guice.version>
+ <jetty.version>9.4.30.v20200611</jetty.version>
+ <jersey.version>2.31</jersey.version>
+ <jackson.version>2.10.1</jackson.version> <!-- same version as jersey-media-json-jackson dependency -->
+ <protobuf.version>3.12.2</protobuf.version>
</properties>
<dependencies>
@@ -28,7 +28,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.13</version>
+ <version>1.14</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -38,27 +38,27 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.18</version>
+ <version>8.0.20</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.2.9</version>
+ <version>42.2.14</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
- <version>7.4.1.jre8</version>
+ <version>8.2.2.jre8</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
- <version>3.4.2</version>
+ <version>3.4.5</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.44.Final</version>
+ <version>4.1.50.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -119,16 +119,6 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
- <exclusions> <!-- exclude dependencies to match gradle -->
- <exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
@@ -153,7 +143,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
- <version>3.8.5</version>
+ <version>3.10.1</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
@@ -209,7 +199,7 @@
<dependency>
<groupId>com.github.jnr</groupId>
<artifactId>jnr-posix</artifactId>
- <version>3.0.51</version>
+ <version>3.0.57</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
@@ -229,7 +219,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
@@ -248,6 +238,12 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.30</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+
</dependencies>
<build>
@@ -299,7 +295,7 @@
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<executions>
- <execution>
+ <!--<execution>
<id>enforce</id>
<configuration>
<rules>
@@ -309,7 +305,7 @@
<goals>
<goal>enforce</goal>
</goals>
- </execution>
+ </execution>-->
<execution>
<id>enforce-bytecode-version</id>
<goals>