Spring/spring-credhub
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade gradle wrapper and Spring gradle plugins. Fixed springIO compatibility checks.

Browse Source
This commit is contained in:
Scott Frederick
2017-11-06 16:58:40 -06:00
parent 76043d2aa8
commit fae55ea40f
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@@ -22,14 +22,15 @@ buildscript {
maven { url 'https://repo.spring.io/plugins-release' } maven { url 'https://repo.spring.io/plugins-release' }
} }
dependencies { dependencies {
classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7' classpath 'io.spring.gradle:propdeps-plugin:0.0.10.RELEASE'
classpath 'io.spring.gradle:spring-io-plugin:0.0.7.RELEASE' classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
} }
} }
ext { ext {
springVersion = "4.3.8.RELEASE" springVersion = "4.3.8.RELEASE"
springCloudConnectorsVersion = "1.2.5.RELEASE"
junitVersion = "4.12" junitVersion = "4.12"
mockitoVersion = "2.7.22" mockitoVersion = "2.7.22"
@@ -78,7 +79,10 @@ allprojects {
dependencyManagement { dependencyManagement {
springIoTestRuntime { springIoTestRuntime {
imports { 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) { task wrapper(type: Wrapper) {
gradleVersion = '3.5' gradleVersion = '4.3'
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Thu Jun 15 09:57:07 CDT 2017 #Mon Nov 06 16:28:48 CST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

6
gradlew vendored
View File

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
warn ( ) { warn () {
echo "$*" echo "$*"
} }
die ( ) { die () {
echo echo
echo "$*" echo "$*"
echo echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi fi
# Escape application args # Escape application args
save ( ) { save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }

2
spring-credhub-cloud-connector/build.gradle
View File

@@ -20,7 +20,7 @@ dependencies {
compile project(':spring-credhub-core') compile project(':spring-credhub-core')
compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}" 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: 'org.springframework', name: 'spring-test', version: "${springVersion}"
testCompile group: 'junit', name: 'junit', version: "${junitVersion}" testCompile group: 'junit', name: 'junit', version: "${junitVersion}"

2
spring-credhub-core/build.gradle
View File

@@ -24,7 +24,7 @@ dependencies {
optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2', version: '2.0.14.RELEASE' 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') { 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.okhttp', name: 'okhttp', version: '2.7.5'
optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'

2
spring-credhub-starter/build.gradle
View File

@@ -37,7 +37,7 @@ dependencies {
optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2' optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2'
optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') { 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.okhttp', name: 'okhttp', version: '2.7.5'
optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'