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
This commit is contained in:
13
build.gradle
13
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
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user