From 42fda0ba15deaacb73bf540ceebffff4575ec49e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 25 Apr 2019 14:32:37 +0200 Subject: [PATCH] Upgrade to Tomcat 9.0.19, Jetty 9.4.17, Netty 4.1.35, OkHttp 3.14.1 Includes upgrade to Hibernate ORM 5.3.10 (for branch 5.1.x) --- build.gradle | 6 +++--- spring-orm/spring-orm.gradle | 2 +- spring-web/spring-web.gradle | 4 ++-- spring-webflux/spring-webflux.gradle | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5f043e1e57..f37b3787b3 100644 --- a/build.gradle +++ b/build.gradle @@ -33,18 +33,18 @@ ext { groovyVersion = "2.5.6" hsqldbVersion = "2.4.1" jackson2Version = "2.9.8" - jettyVersion = "9.4.15.v20190215" + jettyVersion = "9.4.17.v20190418" junit5Version = "5.3.2" kotlinVersion = "1.2.71" log4jVersion = "2.11.2" - nettyVersion = "4.1.34.Final" + nettyVersion = "4.1.35.Final" reactorVersion = "Californium-BUILD-SNAPSHOT" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" rxjava2Version = "2.2.8" slf4jVersion = "1.7.26" // spring-jcl + consistent 3rd party deps tiles3Version = "3.0.8" - tomcatVersion = "9.0.17" + tomcatVersion = "9.0.19" undertowVersion = "2.0.20.Final" gradleScriptDir = "${rootProject.projectDir}/gradle" diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle index 332a46594d..037031e35a 100644 --- a/spring-orm/spring-orm.gradle +++ b/spring-orm/spring-orm.gradle @@ -9,7 +9,7 @@ dependencies { optional(project(":spring-context")) optional(project(":spring-web")) optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4") - optional("org.hibernate:hibernate-core:5.3.9.Final") + optional("org.hibernate:hibernate-core:5.3.10.Final") optional("javax.servlet:javax.servlet-api:3.1.0") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 34e02de820..53e619e440 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -38,7 +38,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") - optional("com.squareup.okhttp3:okhttp:3.14.0") + optional("com.squareup.okhttp3:okhttp:3.14.1") optional("org.apache.httpcomponents:httpclient:4.5.8") { exclude group: "commons-logging", module: "commons-logging" } @@ -75,7 +75,7 @@ dependencies { testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}") testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") - testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.1") testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") testCompile("org.skyscreamer:jsonassert:1.5.0") testCompile("org.xmlunit:xmlunit-matchers:2.6.2") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index b446666925..6a78d99990 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -51,7 +51,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-reactive-httpclient:1.0.3") - testCompile("com.squareup.okhttp3:mockwebserver:3.14.0") + testCompile("com.squareup.okhttp3:mockwebserver:3.14.1") testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}") testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")