diff options
| -rw-r--r-- | build.gradle | 30 | ||||
| -rw-r--r-- | pom.xml | 43 |
2 files changed, 39 insertions, 34 deletions
diff --git a/build.gradle b/build.gradle index 6d14aeb4e..f744cbf5f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,20 +17,20 @@ checkstyle { ext { guiceVersion = "4.2.2" - jettyVersion = "9.4.18.v20190429" - jerseyVersion = "2.28" - jacksonVersion = "2.9.8" + jettyVersion = "9.4.20.v20190813" + jerseyVersion = "2.29" + jacksonVersion = "2.9.9" // same version as jersey-media-json-jackson dependency } dependencies { - implementation "commons-codec:commons-codec:1.12" + implementation "commons-codec:commons-codec:1.13" 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.2.jre8" + implementation "mysql:mysql-connector-java:8.0.17" + implementation "org.postgresql:postgresql:42.2.6" + implementation "com.microsoft.sqlserver:mssql-jdbc:7.4.1.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 "io.netty:netty-all:4.1.39.Final" + implementation "org.slf4j:slf4j-jdk14:1.7.28" implementation "com.google.inject:guice:$guiceVersion" implementation "com.google.inject.extensions:guice-assistedinject:$guiceVersion" implementation "org.owasp.encoder:encoder:1.2.2" @@ -46,19 +46,19 @@ 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.6.3", { + implementation "org.liquibase:liquibase-core:3.8.0", { exclude group: "ch.qos.logback", module: "logback-classic" } implementation "com.sun.mail:javax.mail:1.6.2" - implementation "org.jxls:jxls:2.4.7" - implementation "org.jxls:jxls-poi:1.0.16" + implementation "org.jxls:jxls:2.4.7" // needs upgrade + implementation "org.jxls:jxls-poi:1.0.16" // needs upgrade implementation "org.apache.velocity:velocity:1.7" implementation "org.apache.velocity:velocity-tools:2.0" - implementation "org.apache.commons:commons-collections4:4.2" + 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.3.1" - implementation "com.github.jnr:jnr-posix:3.0.49" + implementation "net.java.dev.jna:jna-platform:5.4.0" + implementation "com.github.jnr:jnr-posix:3.0.50" 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" @@ -12,9 +12,9 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <guice.version>4.2.2</guice.version> - <jetty.version>9.4.18.v20190429</jetty.version> - <jersey.version>2.28</jersey.version> - <jackson.version>2.9.8</jackson.version> <!-- same version as jersey-media-json-jackson dependency --> + <jetty.version>9.4.20.v20190813</jetty.version> + <jersey.version>2.29</jersey.version> + <jackson.version>2.9.9</jackson.version> <!-- same version as jersey-media-json-jackson dependency --> </properties> <dependencies> @@ -27,7 +27,7 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.12</version> + <version>1.13</version> </dependency> <dependency> <groupId>com.h2database</groupId> @@ -37,17 +37,17 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>8.0.15</version> + <version>8.0.17</version> </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.2.5</version> + <version>42.2.6</version> </dependency> <dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>mssql-jdbc</artifactId> - <version>7.2.2.jre8</version> + <version>7.4.1.jre8</version> </dependency> <dependency> <groupId>com.zaxxer</groupId> @@ -57,12 +57,12 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.1.35.Final</version> + <version>4.1.39.Final</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.26</version> + <version>1.7.28</version> </dependency> <dependency> <groupId>com.google.inject</groupId> @@ -118,6 +118,16 @@ <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> @@ -142,7 +152,7 @@ <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> - <version>3.6.3</version> + <version>3.8.0</version> <exclusions> <exclusion> <groupId>ch.qos.logback</groupId> @@ -178,7 +188,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.2</version> + <version>4.4</version> </dependency> <dependency> <groupId>org.mnode.ical4j</groupId> @@ -193,12 +203,12 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna-platform</artifactId> - <version>5.3.1</version> + <version>5.4.0</version> </dependency> <dependency> <groupId>com.github.jnr</groupId> <artifactId>jnr-posix</artifactId> - <version>3.0.49</version> + <version>3.0.50</version> </dependency> <dependency> <groupId>javax.xml.bind</groupId> @@ -230,12 +240,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.26</version> - </dependency> - <dependency> - <groupId>com.github.jnr</groupId> - <artifactId>jffi</artifactId> - <version>1.2.17</version> + <version>1.7.28</version> </dependency> </dependencies> |