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 56251e0..606fd90 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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'