From 49998986170ad16f769ab9eeaafd498219bfde57 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 9 Feb 2017 13:12:15 -0600 Subject: [PATCH] Update to Gradle 3.4-rc-2 We need to explicitly apply Dependency Management to the root project since it depends on modules that use dependency management. We need to ensure dependency management is applied after propdeps-maven to avoid an ordering issue [1] An update to propdeps was necessary to be compatable with Gradle 3.4+ [1] https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/149 Issue: SPR-15207 --- build.gradle | 13 ++++++++++++- gradle/wrapper/gradle-wrapper.jar | Bin 54208 -> 54213 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2d35ff976d4..4a3389518ff 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url "https://repo.spring.io/plugins-snapshot" } } dependencies { - classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7") + classpath("io.spring.gradle:propdeps-plugin:0.0.8") classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0-beta-38") classpath("io.spring.gradle:docbook-reference-plugin:0.3.1") @@ -1250,10 +1250,21 @@ configure(rootProject) { apply plugin: "org.asciidoctor.convert" apply plugin: "docbook-reference" apply plugin: "groovy" + apply plugin: "io.spring.dependency-management" // apply plugin: "detect-split-packages" apply from: "${gradleScriptDir}/jdiff.gradle" + dependencyManagement { + imports { + mavenBom "io.projectreactor:reactor-bom:${reactorVersion}" + } + resolutionStrategy { + cacheChangingModulesFor 0, 'seconds' + } + applyMavenExclusions = false + } + asciidoctor { sourceDir project.file('src/asciidoc') separateOutputDirs = false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7e251616ab3990b129e261f89e099cb45f99c08a..eb00c24aef3d8cb2ef233cecbbf893ba95bfe988 100644 GIT binary patch delta 974 zcmYL{T}YEr7{|}{PPZmAH48IL^I|o~EHSH@McEgdt=Wt$b(%B#X0}i)D+;{pBK3qM zDHXFO2nsHWM6mY#>88>r6j_u=Hwu*nMZNF;$hvs>{hsIi&*8l1oM$%9ZQ~SrEhkAO zL?$Ejs=8gFl=0AbvhMF~FDy^(nzhVXMC5;_mCx8#aRP#CfFJ7x*i|C=B0*?@d>W0c z1eFw0k}?_(Nn9=!L(*0lnOw|xCqd^(b}|c}Q*DY9I@Gpq3L`gi+gNsGUYP=&#_i=x zAkl-#I1FUuUOc>|$Erb^DtuhMN=E6^S^eGo$i>gU9Xd`FXg$$zvXj*u<|y>4Af z8wL{W;ZuEa2sNAgk)}$^OtKK}K3f^Fi3oYf5we-iHD%BwDz)#r;1eOgxN)4xr=}_< z#m$c;82Wv=kb|hN^`$^QcVx;S(mPQWe%no1rr{pPq{;e1ij1!RFWa|%UdM7rHIx(5@e!lC0DiuX~Y zL#-Uo(Y)L!;cr?hGq-dOr4d4w@t7E>9JSo511r25u+Lip&U>}sZr>rW z$H($N7ijS7gj1xweliNKV@J!GEJ`b9})uH3y%}^QmB~%X{2%iQ= z!fbxh*h$naV|C!iF_zOt4x@e$VYy$C6R1s5#&EO>bz=8#H{Z99U@%&Y8Azuk9Rf zDC6R^gs4GN`@Sz2xtHI?vO5b* zJUT5$%_)$`sU^?T_+wYf$5?x;`eu zoTQdHCX1~#OpdobkHb)`y_kdOI);-WUwblC5aq)N3xDjREYsA_F=-uqt3*aW`j_q9 z;5fz>?0sfpot5!rChuQ-XX2lrY(eYG3=Vtmn)!MEh@6lL@n;WEW7~G;$fOlv%DePj zPvu@}ap^J@;w39pi=W2sq!2z^C4FFy<`-g_+af zzzoZ;Z_w=1ONU3F_;lbmp9MVOXB_q$QOEq(z@|V2=n2@syx>K!H)sM^f_0#2_7eDJ zmd#HMHK6VY)q+bQmNSIUpdJac+@Ekg>V^noG*W}QV2;gyv_VyrJ>2@}1&jwb>OJ!U UFJ6_fc|r8{e2HSjCEgSH2O8{`SO5S3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f31854c7e6e..39345658240 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 13 11:20:36 CET 2017 +#Wed Feb 08 08:27:32 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-rc-2-bin.zip