From e17fc8d6077aa6085d216e443173869e7d224280 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 5 May 2018 12:47:34 +0200 Subject: [PATCH] Upgrade to Tomcat 9.0.8, Undertow 2.0.6, Jetty 9.4.10, Gson 2.8.4 --- build.gradle | 8 ++++---- spring-web/spring-web.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 6c76f7c550..21ccc0319f 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ configure(allprojects) { project -> ext.groovyVersion = "2.4.15" ext.hsqldbVersion = "2.4.0" ext.jackson2Version = "2.9.5" - ext.jettyVersion = "9.4.9.v20180320" + ext.jettyVersion = "9.4.10.v20180503" ext.junitPlatformVersion = "1.2.0" ext.junitJupiterVersion = "5.2.0" ext.junitVintageVersion = "5.2.0" @@ -57,10 +57,10 @@ configure(allprojects) { project -> ext.rxjavaVersion = "1.3.8" ext.rxjavaAdapterVersion = "1.2.1" ext.rxjava2Version = "2.1.13" - ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps + ext.slf4jVersion = "1.7.25" // spring-jcl + consistent 3rd party deps ext.tiles3Version = "3.0.8" - ext.tomcatVersion = "9.0.7" - ext.undertowVersion = "2.0.4.Final" + ext.tomcatVersion = "9.0.8" + ext.undertowVersion = "2.0.6.Final" ext.gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 65178923e0..7e687f69b1 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -60,7 +60,7 @@ dependencies { optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}") optional("com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2Version}") - optional("com.google.code.gson:gson:2.8.2") + optional("com.google.code.gson:gson:2.8.4") optional("com.google.protobuf:protobuf-java-util:3.5.1") optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") optional("com.rometools:rome:1.9.0") -- GitLab