From b9478ace95c5b799295dd8a6c0dfb54d428400e7 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 5 Sep 2019 15:30:57 -0400
Subject: [PATCH] Upgrade dependencies; fix some typos in docs

---
 build.gradle                             | 28 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  |  4 ++--
 src/reference/asciidoc/endpoint.adoc     |  3 ++-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 493afa6e80..5906ff6a67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,13 +42,13 @@ ext {
 	modifiedFiles =
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-	activeMqVersion = '5.15.9'
+	activeMqVersion = '5.15.10'
 	apacheSshdVersion = '2.3.0'
 	avroVersion = '1.9.0'
 	aspectjVersion = '1.9.4'
-	assertjVersion = '3.13.1'
+	assertjVersion = '3.13.2'
 	assertkVersion = '0.19'
-	awaitilityVersion = '3.1.6'
+	awaitilityVersion = '4.0.0'
 	boonVersion = '0.34'
 	commonsDbcp2Version = '2.6.0'
 	commonsIoVersion = '2.6'
@@ -57,10 +57,10 @@ ext {
 	derbyVersion = '10.14.2.0'
 	ftpServerVersion = '1.1.1'
 	googleJsr305Version = '3.0.2'
-	groovyVersion = '2.5.7'
+	groovyVersion = '2.5.8'
 	hamcrestVersion = '2.1'
-	hazelcastVersion = '3.12.1'
-	hibernateVersion = '5.4.3.Final'
+	hazelcastVersion = '3.12.2'
+	hibernateVersion = '5.4.4.Final'
 	hsqldbVersion = '2.5.0'
 	h2Version = '1.4.199'
 	jackson2Version = '2.9.9.20190807'
@@ -69,7 +69,7 @@ ext {
 	jmsApiVersion = '2.0.1'
 	jpa21ApiVersion = '1.0.2.Final'
 	jpaApiVersion = '2.2.1'
-	jrubyVersion = '9.2.7.0'
+	jrubyVersion = '9.2.8.0'
 	jschVersion = '0.1.55'
 	jsonpathVersion = '2.4.0'
 	junit4Version = '4.12'
@@ -78,15 +78,15 @@ ext {
 	jythonVersion = '2.7.0'
 	kryoShadedVersion = '4.0.2'
 	lettuceVersion = '5.1.8.RELEASE'
-	log4jVersion = '2.12.0'
+	log4jVersion = '2.12.1'
 	micrometerVersion = '1.2.0'
 	mockitoVersion = '3.0.0'
 	mysqlVersion = '8.0.16'
 	pahoMqttClientVersion = '1.2.0'
 	postgresVersion = '42.2.6'
-	reactorNettyVersion = '0.9.0.BUILD-SNAPSHOT'
-	reactorVersion = '3.3.0.BUILD-SNAPSHOT'
-	resilience4jVersion = '0.16.0'
+	reactorNettyVersion = '0.9.0.RC1'
+	reactorVersion = '3.3.0.RC1'
+	resilience4jVersion = '0.17.0'
 	romeToolsVersion = '1.12.1'
 	rsocketVersion = '1.0.0-RC3'
 	servletApiVersion = '4.0.1'
@@ -98,9 +98,9 @@ ext {
 	springGemfireVersion = '2.2.0.BUILD-SNAPSHOT'
 	springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
 	springRetryVersion = '1.2.4.RELEASE'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RC2'
 	springWsVersion = '3.0.7.RELEASE'
-	tomcatVersion = "9.0.19"
+	tomcatVersion = "9.0.24"
 	xstreamVersion = '1.4.11.1'
 }
 
@@ -325,7 +325,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.21"
+		toolVersion = "8.24"
 	}
 
 	artifacts {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4b7e1f3d38..7c4388a921 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 8e25e6c19d..83f2acfdc3 100755
--- a/gradlew
+++ b/gradlew
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/src/reference/asciidoc/endpoint.adoc b/src/reference/asciidoc/endpoint.adoc
index b11629a500..59d2686464 100644
--- a/src/reference/asciidoc/endpoint.adoc
+++ b/src/reference/asciidoc/endpoint.adoc
@@ -517,6 +517,7 @@ public class TestConverter implements Converter<Boolean, Number> {
 ====
 
 Alternately, you can use the `@Configuration` annotation, as the following example shows:
+
 [source,java]
 ----
 @Configuration
@@ -621,7 +622,7 @@ The preceding configuration demonstrates an out-of-tune configuration.
 
 By default, the task executor has an unbounded task queue.
 The poller keeps scheduling new tasks even though all the threads are blocked, waiting for either a new message to arrive or the timeout to expire.
-Given that there are 20 threads executing tasks with a five-second timeout, they aree executed at a rate of 4 per second.
+Given that there are 20 threads executing tasks with a five-second timeout, they are executed at a rate of 4 per second.
 However, new tasks are being scheduled at a rate of 20 per second, so the internal queue in the task executor grows at a rate of 16 per second (while the process is idle), so we have a memory leak.
 
 One of the ways to handle this is to set the `queue-capacity` attribute of the task executor.