From 0c29f7dada2cbcddd4e6cdc2c2a96c6da734a6c9 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 5 Sep 2019 14:04:55 -0400
Subject: [PATCH] Upgrade dependencies, including Gradle

---
 build.gradle                             | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index ec4bf8f3..0dc73e7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-	ext.kotlinVersion = '1.3.40'
+	ext.kotlinVersion = '1.3.50'
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
@@ -37,7 +37,7 @@ ext {
 	modifiedFiles =
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
-	assertjVersion = '3.12.2'
+	assertjVersion = '3.13.2'
 	assertkVersion = '0.19'
 	commonsHttpClientVersion = '4.5.9'
 	googleJsr305Version = '3.0.2'
@@ -47,14 +47,14 @@ ext {
 	junit4Version = '4.12'
 	junitJupiterVersion = '5.5.1'
 	junitPlatformVersion = '1.5.1'
-	log4jVersion = '2.12.0'
+	log4jVersion = '2.12.1'
 	logbackVersion = '1.2.3'
 	mockitoVersion = '3.0.0'
 	rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.7.3'
 	rabbitmqHttpClientVersion = '3.2.0.RELEASE'
-	reactorVersion = '3.3.0.BUILD-SNAPSHOT'
+	reactorVersion = '3.3.0.RC1'
 	springDataCommonsVersion = '2.2.0.BUILD-SNAPSHOT'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RC2'
 	springRetryVersion = '1.2.4.RELEASE'
 }
 
@@ -249,7 +249,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 4b7e1f3d..7c4388a9 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 8e25e6c1..83f2acfd 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"`