From 1107071de406fdbe8b7672a440a1170f65ee473c Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Wed, 18 Sep 2019 15:17:14 +0200 Subject: [PATCH] project: Update deps --- .gitignore | 1 + build.gradle | 21 +++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 5 +++-- gradlew | 0 4 files changed, 15 insertions(+), 12 deletions(-) mode change 100755 => 100644 gradlew diff --git a/.gitignore b/.gitignore index 3ce4787a8b..ed592f5deb 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ git classes/artifacts/client_jar/run.bat classes/artifacts/client_jar/client.jar *.jar +!gradle-wrapper.jar .live/ **/build/* */out/ diff --git a/build.gradle b/build.gradle index a6c7ff6d0b..6f134e47f6 100644 --- a/build.gradle +++ b/build.gradle @@ -48,34 +48,35 @@ ext { jbsdiff = '1.0' jclCore = '2.8' jedis = '3.1.0' + jfoenix = '9.0.9' jna = '5.4.0' jogamp = '2.3.2' jopt = '5.0.4' jooq = '3.12.1' junit = '4.12' - jupiter = '5.5.1' + jupiter = '5.5.2' logback = '1.2.3' - lombok = '1.18.8' + lombok = '1.18.10' mapstruct = '1.3.0.Final' - mariadbJdbc = '2.4.3' + mariadbJdbc = '2.4.4' mavenPluginAnnotations = '3.6.0' mavenPluginApi = '3.6.2' - minio = '6.0.10' + minio = '6.0.11' mockito = '3.0.0' mongodbDriverSync = '3.11.0' mysqlConnectorJava = '8.0.17' netty = '4.1.39.Final' - okhttp3 = '4.1.0' + okhttp3 = '4.2.0' orangeExtensions = '1.0' petitparser = '2.2.0' plexus = '3.2.1' rxjava = '2.2.12' rxrelay = '2.1.1' - scribejava = '6.7.0' + scribejava = '6.8.1' sisu = '0.3.3' slf4j = '1.7.28' springJdbc = '5.1.9.RELEASE' - springboot = '2.1.7.RELEASE' + springboot = '2.1.8.RELEASE' sql2o = '1.6.0' substance = '8.0.02' trident = '1.5.00' @@ -136,8 +137,8 @@ subprojects { checkstyle { toolVersion = '6.4.1' sourceSets = [sourceSets.main] - configFile = rootProject.file("./checkstyle/checkstyle.xml") - configProperties = [ "suppressionFile" : rootProject.file("./checkstyle/suppressions.xml")] + configFile = file("${rootDir}/checkstyle/checkstyle.xml") + configProperties = [ "suppressionFile" : file("${rootDir}/checkstyle/suppressions.xml")] showViolations = true ignoreFailures = false maxWarnings = 0 @@ -155,7 +156,7 @@ subprojects { } wrapper { - gradleVersion = '5.6' + gradleVersion = '5.6.2' doLast { def optsEnvVar = "DEFAULT_JVM_OPTS" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59b5f89288..81ace47749 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Sep 18 13:49:35 CEST 2019 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100755 new mode 100644