From 1c6a22e5c79d4ed00e25241c05c55180dfd8edd8 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Wed, 4 Sep 2019 17:29:29 +0200
Subject: [PATCH 1/2] project: Update dependencies

---
 build.gradle | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 543cbe322b..6d667e0b55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,20 +27,20 @@ ext {
     // Dependencies versions
     annotations = '17.0.0'
     antlr = '4.7.2'
-    apacheCommonsCompress = '1.18'
+    apacheCommonsCompress = '1.19'
     apacheCommonsCsv = '1.7'
-    apacheCommonsText = '1.7'
+    apacheCommonsText = '1.8'
     asm = '7.1'
     commonsCli = '1.4'
     discord = '1.1'
     fernflower = '07082019'
     findbugs = '3.0.2'
     gson = '2.8.5'
-    guava = '28.0-jre'
+    guava = '28.1-jre'
     guice = '4.2.2'
     h2 = '1.4.199'
     hamcrest = '2.1'
-    httpcore = '4.4.11'
+    httpcore = '4.4.12'
     httpmime = '4.5.9'
     javassist = '3.25.0-GA'
     javaxInject = '1'
@@ -50,7 +50,7 @@ ext {
     jna = '5.4.0'
     jogamp = '2.3.2'
     jopt = '5.0.4'
-    jooq = '3.11.12'
+    jooq = '3.12.1'
     junit = '4.12'
     jupiter = '5.5.1'
     logback = '1.2.3'
@@ -58,21 +58,21 @@ ext {
     mapstruct = '1.3.0.Final'
     mariadbJdbc = '2.4.3'
     mavenPluginAnnotations = '3.6.0'
-    mavenPluginApi = '3.6.1'
-    minio = '6.0.9'
+    mavenPluginApi = '3.6.2'
+    minio = '6.0.10'
     mockito = '3.0.0'
     mongodbDriverSync = '3.11.0'
     mysqlConnectorJava = '8.0.17'
-    netty = '4.1.37.Final'
+    netty = '4.1.39.Final'
     okhttp3 = '4.1.0'
     orangeExtensions = '1.0'
     petitparser = '2.2.0'
     plexus = '3.2.1'
-    rxjava = '2.2.11'
-    rxrelay = '2.1.0'
+    rxjava = '2.2.12'
+    rxrelay = '2.1.1'
     scribejava = '6.7.0'
     sisu = '0.3.3'
-    slf4j = '1.7.26'
+    slf4j = '1.7.28'
     springJdbc = '5.1.9.RELEASE'
     springboot = '2.1.7.RELEASE'
     sql2o = '1.6.0'

From 92b75ec5d4c9612479fd4b7a2be50ff8eea09932 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Wed, 4 Sep 2019 17:29:40 +0200
Subject: [PATCH 2/2] project update gradle

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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef9a9e05e4..59b5f89288 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 7ebc6048bc..a016f754cd 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"`