diff --git a/build.gradle b/build.gradle index ea67316..67a5a91 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 606fd90..28861d2 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 c99c516..115e6ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/spring-credhub-cloud-connector/build.gradle b/spring-credhub-cloud-connector/build.gradle index 512cdfd..5381919 100644 --- a/spring-credhub-cloud-connector/build.gradle +++ b/spring-credhub-cloud-connector/build.gradle @@ -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}") } diff --git a/spring-credhub-core/build.gradle b/spring-credhub-core/build.gradle index 41f3119..275b38d 100644 --- a/spring-credhub-core/build.gradle +++ b/spring-credhub-core/build.gradle @@ -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") } diff --git a/spring-credhub-demo/build.gradle b/spring-credhub-demo/build.gradle index f414fdc..73dc1f4 100644 --- a/spring-credhub-demo/build.gradle +++ b/spring-credhub-demo/build.gradle @@ -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() -} \ No newline at end of file +} diff --git a/spring-credhub-starter/build.gradle b/spring-credhub-starter/build.gradle index 33090e8..154b30c 100644 --- a/spring-credhub-starter/build.gradle +++ b/spring-credhub-starter/build.gradle @@ -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}") }