From fae55ea40fb6318cdd0c765c7b8b4a285e303fb5 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Mon, 6 Nov 2017 16:58:40 -0600 Subject: [PATCH] Upgrade gradle wrapper and Spring gradle plugins. Fixed springIO compatibility checks. --- build.gradle | 12 ++++++++---- gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 54706 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 6 +++--- spring-credhub-cloud-connector/build.gradle | 2 +- spring-credhub-core/build.gradle | 2 +- spring-credhub-starter/build.gradle | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 6bc96b7..0952fb3 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,15 @@ buildscript { maven { url 'https://repo.spring.io/plugins-release' } } dependencies { - classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' - classpath 'io.spring.gradle:spring-io-plugin:0.0.7.RELEASE' + classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE' + classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE' classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' } } ext { springVersion = "4.3.8.RELEASE" + springCloudConnectorsVersion = "1.2.5.RELEASE" junitVersion = "4.12" mockitoVersion = "2.7.22" @@ -78,7 +79,10 @@ allprojects { dependencyManagement { springIoTestRuntime { imports { - mavenBom "io.spring.platform:platform-bom:${platformVersion}" + mavenBom("io.spring.platform:platform-bom:${platformVersion}") { + bomProperty "spring-cloud-connectors.version", "${springCloudConnectorsVersion}" + bomProperty "mockito.version", "${mockitoVersion}" + } } } } @@ -171,5 +175,5 @@ task dist(dependsOn: assemble) { } task wrapper(type: Wrapper) { - gradleVersion = '3.5' + gradleVersion = '4.3' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 56251e0265c76089916b7bb4e59f1f48855ac60e..606fd902d1a560bf7550e1ebc7e02d1623043610 100644 GIT binary patch delta 17150 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 delta 17182 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 F0{}lv?HB+6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a8155d5..6c060d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 15 09:57:07 CDT 2017 +#Mon Nov 06 16:28:48 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/spring-credhub-cloud-connector/build.gradle b/spring-credhub-cloud-connector/build.gradle index 67f08d1..aa08ed0 100644 --- a/spring-credhub-cloud-connector/build.gradle +++ b/spring-credhub-cloud-connector/build.gradle @@ -20,7 +20,7 @@ dependencies { compile project(':spring-credhub-core') compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}" - compile group: 'org.springframework.cloud', name: 'spring-cloud-cloudfoundry-connector', version: '1.2.5.RC1' + compile group: 'org.springframework.cloud', name: 'spring-cloud-cloudfoundry-connector', version: "${springCloudConnectorsVersion}" testCompile group: 'org.springframework', name: 'spring-test', version: "${springVersion}" testCompile group: 'junit', name: 'junit', version: "${junitVersion}" diff --git a/spring-credhub-core/build.gradle b/spring-credhub-core/build.gradle index 5458af2..5635466 100644 --- a/spring-credhub-core/build.gradle +++ b/spring-credhub-core/build.gradle @@ -24,7 +24,7 @@ dependencies { optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: '2.0.14.RELEASE' optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') { - exclude(module: 'commons-logging') + exclude(group: 'commons-logging', module: 'commons-logging') } optional group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5' optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' diff --git a/spring-credhub-starter/build.gradle b/spring-credhub-starter/build.gradle index 4f38dee..e1c7b1f 100644 --- a/spring-credhub-starter/build.gradle +++ b/spring-credhub-starter/build.gradle @@ -37,7 +37,7 @@ dependencies { optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2' optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') { - exclude(module: 'commons-logging') + exclude(group: 'commons-logging', module: 'commons-logging') } optional group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5' optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'