From b1ed0511f7775c9edda3ea922cc8b7f6da3699dd Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 25 Sep 2019 12:15:02 +0200
Subject: [PATCH] Upgrade to Tomcat 9.0.26, Undertow 2.0.26, Hibernate ORM
 5.3.12

Includes Netty 4.1.39 (aligned with Reactor) and Checkstyle 8.24.
---
 build.gradle                         | 8 ++++----
 spring-aspects/spring-aspects.gradle | 2 +-
 spring-orm/spring-orm.gradle         | 2 +-
 spring-test/spring-test.gradle       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0bb9c5d9c2..438fb88bba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,15 +37,15 @@ ext {
 	junit5Version        = "5.3.2"
 	kotlinVersion        = "1.2.71"
 	log4jVersion         = "2.11.2"
-	nettyVersion         = "4.1.38.Final"
+	nettyVersion         = "4.1.39.Final"
 	reactorVersion       = "Californium-SR12"
 	rxjavaVersion        = "1.3.8"
 	rxjavaAdapterVersion = "1.2.1"
 	rxjava2Version       = "2.2.10"
 	slf4jVersion         = "1.7.26"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
-	tomcatVersion        = "9.0.22"
-	undertowVersion      = "2.0.23.Final"
+	tomcatVersion        = "9.0.26"
+	undertowVersion      = "2.0.26.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
 	withoutJclOverSlf4j = {
@@ -142,7 +142,7 @@ configure(allprojects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.23"
+		toolVersion = "8.24"
 		configDir = rootProject.file("src/checkstyle")
 	}
 
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
index 51bab8a819..0152c677a9 100644
--- a/spring-aspects/spring-aspects.gradle
+++ b/spring-aspects/spring-aspects.gradle
@@ -89,7 +89,7 @@ dependencies {
 	optional(project(":spring-context-support"))  // for JavaMail and JSR-107 support
 	optional(project(":spring-orm"))  // for JPA exception translation support
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
-	optional("javax.cache:cache-api:1.1.0") // for JCache aspect
+	optional("javax.cache:cache-api:1.1.0")  // for JCache aspect
 	optional("javax.transaction:javax.transaction-api:1.3")  // for @javax.transaction.Transactional support
 	testCompile(project(":spring-core"))  // for CodeStyleAspect
 	testCompile(project(":spring-test"))
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 037031e35a..9fa89d919d 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.10.Final")
+	optional("org.hibernate:hibernate-core:5.3.12.Final")
 	optional("javax.servlet:javax.servlet-api:3.1.0")
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 5d6507a260..d4ecfbbe76 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -60,7 +60,7 @@ dependencies {
 	testCompile("javax.ejb:javax.ejb-api:3.2")
 	testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
 	testCompile("javax.mail:javax.mail-api:1.6.2")
-	testCompile("org.hibernate:hibernate-core:5.3.10.Final")
+	testCompile("org.hibernate:hibernate-core:5.3.12.Final")
 	testCompile("org.hibernate:hibernate-validator:6.0.17.Final")
 	// Enable use of the JUnit Platform Runner
 	testCompile("org.junit.platform:junit-platform-runner")
-- 
GitLab