From 95fdfac1281b7c54755890a43ccc9a4f617a69c9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 29 Sep 2017 17:57:11 +0200 Subject: [PATCH] Upgrade to Gradle 4.2 (and Netty 4.1.16) Issue: SPR-15985 --- build.gradle | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.jar | Bin 54713 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 4ed2b697b5..1abbba06f7 100644 --- a/build.gradle +++ b/build.gradle @@ -47,16 +47,16 @@ configure(allprojects) { project -> ext.hsqldbVersion = "2.4.0" ext.jackson2Version = "2.9.1" ext.jettyVersion = "9.4.7.v20170914" - ext.junitJupiterVersion = '5.0.0' - ext.junitPlatformVersion = '1.0.0' + ext.junitJupiterVersion = "5.0.0" + ext.junitPlatformVersion = "1.0.0" ext.junitVintageVersion = "4.12.0" - ext.kotlinVersion = '1.1.51' - ext.log4jVersion = '2.9.1' - ext.nettyVersion = "4.1.15.Final" + ext.kotlinVersion = "1.1.51" + ext.log4jVersion = "2.9.1" + ext.nettyVersion = "4.1.16.Final" ext.reactorVersion = "Bismuth-RELEASE" - ext.rxjavaVersion = '1.3.2' - ext.rxjavaAdapterVersion = '1.2.1' - ext.rxjava2Version = '2.1.4' + ext.rxjavaVersion = "1.3.2" + ext.rxjavaAdapterVersion = "1.2.1" + ext.rxjava2Version = "2.1.4" ext.slf4jVersion = "1.7.25" ext.tiles3Version = "3.0.7" ext.tomcatVersion = "8.5.21" @@ -268,7 +268,7 @@ configure(rootProject) { task wrapper(type: Wrapper) { description = "Generates gradlew[.bat] scripts" - gradleVersion = '4.1' + gradleVersion = '4.2' doLast() { def gradleOpts = "-XX:MaxMetaspaceSize=1024m -Xmx1024m" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ae3d248e62c267f98e8b529fb5539ccfad6d6def..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42 100644 GIT binary patch delta 51 zcmdnFnt97=<_)?>_*obNyxBRtR)5G9W?*0t-0XNnN01ZFom_U+md*YMP=)~jwbBnZ delta 56 zcmdn8ntA7H<_)?>M6T$1T{C532=Hd-sNXcbP=bMhL2R?l5gkEJICpa4Ra-WfBS0Aj E05K*JYybcN diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f16d26666b..52dd1f0443 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip