From 608fd766cb0ba461992101579ecc3223a23ace86 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Mon, 15 Oct 2018 00:01:45 +0200
Subject: [PATCH] Upgrade to Checkstyle 8.13, Groovy 2.5.3, Aalto XML 1.1.1

---
 build.gradle                         | 5 ++---
 spring-web/spring-web.gradle         | 2 +-
 spring-webflux/spring-webflux.gradle | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 10717c0496a..e6bfb0f11d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ ext {
 
 	aspectjVersion       = "1.9.1"
 	freemarkerVersion    = "2.3.28"
-	groovyVersion        = "2.5.2"
+	groovyVersion        = "2.5.3"
 	hsqldbVersion        = "2.4.1"
 	jackson2Version      = "2.9.7"
 	jettyVersion         = "9.4.12.v20180830"
@@ -142,13 +142,12 @@ configure(allprojects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.10.1"
+		toolVersion = "8.13"
 		configDir = rootProject.file("src/checkstyle")
 	}
 
 	repositories {
 		maven { url "https://repo.spring.io/libs-release" }
-		maven { url "https://repo.spring.io/libs-snapshot" } // for Reactor
 	}
 
 	dependencies {
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index e38b5a7e1e2..2a66fe75b86 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -50,7 +50,7 @@ dependencies {
 	optional("com.fasterxml.woodstox:woodstox-core:5.1.0") {  // woodstox before aalto
 		exclude group: "stax", module: "stax-api"
 	}
-	optional("com.fasterxml:aalto-xml:1.1.0")
+	optional("com.fasterxml:aalto-xml:1.1.1")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
index 80336e0a330..ccec0fa4c2a 100644
--- a/spring-webflux/spring-webflux.gradle
+++ b/spring-webflux/spring-webflux.gradle
@@ -41,7 +41,7 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	optional("com.google.protobuf:protobuf-java-util:3.6.1")
 	testCompile("javax.xml.bind:jaxb-api:2.3.0")
-	testCompile("com.fasterxml:aalto-xml:1.1.0")
+	testCompile("com.fasterxml:aalto-xml:1.1.1")
 	testCompile("org.hibernate:hibernate-validator:6.0.13.Final")
 	testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
 	testCompile("io.projectreactor:reactor-test")