diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 5190e7d706..a36e4d1c11 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,11 +1,11 @@
-def groovyVer = "2.5.7"
+def groovyVer = "2.5.8"
 def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '')
 
 ext {
   versions = [
     opentracing: '0.31.0',
 
-    slf4j      : "1.7.25",
+    slf4j      : "1.7.28",
     guava      : "20.0", // Last version to support Java 7
 
     // When upgrading for security fixes, ensure corresponding change is reflected in jmxfetch.
@@ -15,11 +15,11 @@ ext {
     groovy     : groovyVer,
     junit      : "4.12",
     logback    : "1.2.3",
-    lombok     : "1.18.4",
+    lombok     : "1.18.8",
     bytebuddy  : "1.10.0",
     scala      : "2.11.12",  // Last version to support Java 7 (2.12+ require Java 8+)
-    kotlin     : "1.3.11",
-    coroutines : "1.1.0"
+    kotlin     : "1.3.50",
+    coroutines : "1.3.0"
   ]
 
   deps = [
@@ -61,8 +61,8 @@ ext {
       dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j),
       dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j),
     ],
-    scala         : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
-    kotlin        : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"),
-    coroutines    : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"),
+    scala          : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
+    kotlin         : dependencies.create(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: "${versions.kotlin}"),
+    coroutines     : dependencies.create(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "${versions.coroutines}"),
   ]
 }
diff --git a/gradle/test-with-kotlin.gradle b/gradle/test-with-kotlin.gradle
index decddb32d3..bd2f8ad295 100644
--- a/gradle/test-with-kotlin.gradle
+++ b/gradle/test-with-kotlin.gradle
@@ -1,10 +1,6 @@
 // Enable testing kotlin code in groovy spock tests.
 apply plugin: 'kotlin'
 
-kotlin {
-  copyClassesToJavaOutput = true
-}
-
 compileTestGroovy {
   classpath = classpath.plus(files(compileTestKotlin.destinationDir))
   dependsOn compileTestKotlin
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d58bda447..dbe85eef28 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.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.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"`