From 9f92b42d69a41ff6b104431d7dea562fcf0d9ad9 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Tue, 11 Jun 2019 18:26:13 +0200
Subject: [PATCH] Upgrade to Tomcat 9.0.21, Undertow 2.0.21, RxJava 2.2.9,
 Checkstyle 8.21, Mockito 2.28.2, Hibernate ORM 5.4.3

Centralizes rsocketVersion declaration in build.gradle; also includes upgrade to Reactor Dysprosium M2 proper.
---
 build.gradle                             | 15 ++++++++-------
 spring-messaging/spring-messaging.gradle |  2 --
 spring-orm/spring-orm.gradle             |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1b3af493b8..98ce674fb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,14 +39,15 @@ ext {
 	kotlinVersion        = "1.3.31"
 	log4jVersion         = "2.11.2"
 	nettyVersion         = "4.1.36.Final"
-	reactorVersion       = "Dysprosium-BUILD-SNAPSHOT"
+	reactorVersion       = "Dysprosium-M2"
+	rsocketVersion       = "0.12.2-RC4-SNAPSHOT"
 	rxjavaVersion        = "1.3.8"
 	rxjavaAdapterVersion = "1.2.1"
-	rxjava2Version       = "2.2.8"
+	rxjava2Version       = "2.2.9"
 	slf4jVersion         = "1.7.26"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
-	tomcatVersion        = "9.0.19"
-	undertowVersion      = "2.0.20.Final"
+	tomcatVersion        = "9.0.21"
+	undertowVersion      = "2.0.21.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
 	withoutJclOverSlf4J = {
@@ -142,13 +143,13 @@ configure(allprojects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.20"
+		toolVersion = "8.21"
 		configDir = rootProject.file("src/checkstyle")
 	}
 
 	repositories {
 		maven { url "https://repo.spring.io/libs-release" }
-		maven { url "https://repo.spring.io/snapshot" } // Reactor
+		maven { url "https://repo.spring.io/milestone" } // Reactor
 		maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket
 		mavenLocal()
 	}
@@ -157,7 +158,7 @@ configure(allprojects) { project ->
 		testCompile("junit:junit:4.13-beta-3") {
 			exclude group: "org.hamcrest", module: "hamcrest-core"
 		}
-		testCompile("org.mockito:mockito-core:2.27.0") {
+		testCompile("org.mockito:mockito-core:2.28.2") {
 			exclude group: "org.hamcrest", module: "hamcrest-core"
 		}
 		testCompile("io.mockk:mockk:1.9.3")
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index df5a1f1316..7a60aee469 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -7,8 +7,6 @@ dependencyManagement {
 	}
 }
 
-def rsocketVersion = "0.12.2-RC4-SNAPSHOT"
-
 dependencies {
 	compile(project(":spring-beans"))
 	compile(project(":spring-core"))
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
index 254b6a3422..888293b229 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.4.2.Final")
+	optional("org.hibernate:hibernate-core:5.4.3.Final")
 	optional("javax.servlet:javax.servlet-api:3.1.0")
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")