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

Add Boot configuration properties annotation processor. Upgrade Gradle to 4.10.

Browse Source
This commit is contained in:
Scott Frederick
2018-10-26 10:35:04 -05:00
parent 78b524b931
commit 9069d4a83f
7 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@@ -90,8 +90,8 @@ allprojects {
}
subprojects {
sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
@@ -174,6 +174,6 @@ task dist(dependsOn: assemble) {
description = 'Builds -dist and -docs distribution archives.'
}
task wrapper(type: Wrapper) {
gradleVersion = '4.3'
wrapper {
gradleVersion = '4.10'
}

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

Binary file not shown.

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

@@ -1,6 +1,5 @@
#Mon Oct 15 14:35:08 CDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip

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

@@ -19,11 +19,11 @@ description = 'Spring CredHub Cloud Connector'
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: "${springCloudConnectorsVersion}"
compile "org.springframework:spring-core:${springVersion}"
compile "org.springframework.cloud:spring-cloud-cloudfoundry-connector:${springCloudConnectorsVersion}"
testCompile group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
testCompile group: 'junit', name: 'junit', version: "${junitVersion}"
testCompile group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}"
testCompile group: 'org.assertj', name: 'assertj-core', version: "${assertJVersion}"
testImplementation("org.springframework:spring-test:${springVersion}")
testImplementation("junit:junit:${junitVersion}")
testImplementation("org.mockito:mockito-core:${mockitoVersion}")
testImplementation("org.assertj:assertj-core:${assertJVersion}")
}

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

@@ -17,21 +17,21 @@
description = 'Spring CredHub Core'
dependencies {
compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}"
compile group: 'org.springframework', name: 'spring-beans', version: "${springVersion}"
compile group: 'org.springframework', name: 'spring-web', version: "${springVersion}"
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.7'
compile("org.springframework:spring-core:${springVersion}")
compile("org.springframework:spring-beans:${springVersion}")
compile("org.springframework:spring-web:${springVersion}")
compile("com.fasterxml.jackson.core:jackson-databind:2.8.7")
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("org.springframework.security.oauth:spring-security-oauth2:2.0.14.RELEASE")
optional("org.apache.httpcomponents:httpclient:4.5.3") {
exclude(group: 'commons-logging', module: 'commons-logging')
}
optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
optional group: 'io.netty', name: 'netty-all', version: '4.1.8.Final'
optional("com.squareup.okhttp3:okhttp:3.6.0")
optional("io.netty:netty-all:4.1.8.Final")
testCompile group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
testCompile group: 'junit', name: 'junit', version: "${junitVersion}"
testCompile group: 'org.mockito', name: 'mockito-core', version: "${mockitoVersion}"
testCompile group: 'org.assertj', name: 'assertj-core', version: "${assertJVersion}"
testCompile group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
testImplementation("org.springframework:spring-test:${springVersion}")
testImplementation("junit:junit:${junitVersion}")
testImplementation("org.mockito:mockito-core:${mockitoVersion}")
testImplementation("org.assertj:assertj-core:${assertJVersion}")
testImplementation("com.jayway.jsonpath:json-path:2.4.0")
}

8
spring-credhub-demo/build.gradle
View File

@@ -44,13 +44,13 @@ apply plugin: 'propdeps-eclipse'
apply plugin: 'org.springframework.boot'
dependencies {
compile group: 'org.springframework.credhub', name: 'spring-credhub-starter', version: '1.0.0.RELEASE'
compile("org.springframework.credhub:spring-credhub-starter:1.0.0.RELEASE")
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
compile("org.springframework.boot:spring-boot-starter-web")
compile("org.springframework.boot:spring-boot-starter-actuator")
}
repositories {
mavenLocal()
mavenCentral()
}
}

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

@@ -33,15 +33,18 @@ bootRepackage {
dependencies {
compile project(':spring-credhub-core')
compile group: 'org.springframework.boot', name: 'spring-boot-starter'
compile("org.springframework.boot:spring-boot-starter")
optional group: 'org.springframework.security.oauth', name: 'spring-security-oauth2'
optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') {
optional("org.springframework.security.oauth:spring-security-oauth2")
optional("org.apache.httpcomponents:httpclient:4.5.3") {
exclude(group: 'commons-logging', module: 'commons-logging')
}
optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
optional group: 'io.netty', name: 'netty-all', version: '4.1.8.Final'
optional("com.squareup.okhttp3:okhttp:3.6.0")
optional("io.netty:netty-all:4.1.8.Final")
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
testCompile group: 'org.assertj', name: 'assertj-core', version: "${assertJVersion}"
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.assertj:assertj-core:${assertJVersion}")
}