From f096785ecc8895cbe3078041fa85a4266e3fe45f Mon Sep 17 00:00:00 2001 From: Gareth Clay Date: Thu, 18 Jun 2020 15:13:45 +0100 Subject: [PATCH] Make dependencies more groovy --- .../build.gradle | 13 +++++------ .../build.gradle | 22 +++++++++---------- .../build.gradle | 14 ++++++------ spring-cloud-app-broker-deployer/build.gradle | 10 ++++----- spring-cloud-app-broker-docs/build.gradle | 14 ++++++------ .../build.gradle | 11 ++++------ .../build.gradle | 14 ++++++------ 7 files changed, 46 insertions(+), 52 deletions(-) diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle index 09fa8df..f8c2dd3 100644 --- a/spring-cloud-app-broker-acceptance-tests/build.gradle +++ b/spring-cloud-app-broker-acceptance-tests/build.gradle @@ -20,17 +20,14 @@ plugins { description = "Spring Cloud App Broker Acceptance Tests" -// don't publish the jar for the acceptance tests project -configurations.archives.artifacts.clear() - dependencies { implementation project(":spring-cloud-starter-app-broker-cloudfoundry") - implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation "org.springframework.boot:spring-boot-starter-webflux" - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.projectreactor:reactor-test") - testImplementation("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}") - testImplementation("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "io.projectreactor:reactor-test" + testImplementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + testImplementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" } // omit the version from the test broker jar file diff --git a/spring-cloud-app-broker-autoconfigure/build.gradle b/spring-cloud-app-broker-autoconfigure/build.gradle index 62a0b98..16d3f8d 100644 --- a/spring-cloud-app-broker-autoconfigure/build.gradle +++ b/spring-cloud-app-broker-autoconfigure/build.gradle @@ -29,26 +29,26 @@ java { } dependencies { - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor") + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor" implementation project(":spring-cloud-app-broker-core") implementation project(":spring-cloud-app-broker-deployer") implementation project(":spring-cloud-app-broker-deployer-cloudfoundry") implementation project(":spring-cloud-app-broker-security-credhub") - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-webflux") - implementation("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}") - implementation("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}") - implementation("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}") + implementation "org.springframework.boot:spring-boot-starter" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" + implementation "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}" loggingImplementation project(":spring-cloud-app-broker-logging") - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.springframework.boot:spring-boot-starter-webflux" + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly "org.junit.platform:junit-platform-launcher" } compileJava.dependsOn(processResources) diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle index b224558..a7d20b0 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle +++ b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle @@ -24,13 +24,13 @@ dependencyManagement { dependencies { implementation project(":spring-cloud-app-broker-deployer") - implementation("org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}") - implementation("org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}") - implementation("org.springframework.boot:spring-boot-starter-validation") + implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" + implementation "org.springframework.boot:spring-boot-starter-validation" - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly "org.junit.platform:junit-platform-launcher" - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.projectreactor:reactor-test") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "io.projectreactor:reactor-test" + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" } diff --git a/spring-cloud-app-broker-deployer/build.gradle b/spring-cloud-app-broker-deployer/build.gradle index c9faf8a..304a811 100644 --- a/spring-cloud-app-broker-deployer/build.gradle +++ b/spring-cloud-app-broker-deployer/build.gradle @@ -23,11 +23,11 @@ dependencyManagement { } dependencies { - implementation("org.springframework:spring-core") - implementation("io.projectreactor:reactor-core") + implementation "org.springframework:spring-core" + implementation "io.projectreactor:reactor-core" - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly "org.junit.platform:junit-platform-launcher" - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" } diff --git a/spring-cloud-app-broker-docs/build.gradle b/spring-cloud-app-broker-docs/build.gradle index 2ccdcda..9d1b970 100644 --- a/spring-cloud-app-broker-docs/build.gradle +++ b/spring-cloud-app-broker-docs/build.gradle @@ -33,14 +33,14 @@ dependencyManagement { dependencies { implementation project(":spring-cloud-app-broker-core") - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-security") - implementation("org.springframework.boot:spring-boot-starter-tomcat") - implementation("io.projectreactor:reactor-core") - implementation("org.springframework.boot:spring-boot-starter-data-r2dbc:2.3.0.RELEASE") - implementation("io.r2dbc:r2dbc-h2:0.8.0.RELEASE") + implementation "org.springframework.boot:spring-boot-starter" + implementation "org.springframework.boot:spring-boot-starter-security" + implementation "org.springframework.boot:spring-boot-starter-tomcat" + implementation "io.projectreactor:reactor-core" + implementation "org.springframework.boot:spring-boot-starter-data-r2dbc:2.3.0.RELEASE" + implementation "io.r2dbc:r2dbc-h2:0.8.0.RELEASE" - docs("io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip") + docs "io.spring.docresources:spring-doc-resources:0.2.1.RELEASE@zip" } javadoc { diff --git a/spring-cloud-app-broker-integration-tests/build.gradle b/spring-cloud-app-broker-integration-tests/build.gradle index 35bdb10..dd6d892 100644 --- a/spring-cloud-app-broker-integration-tests/build.gradle +++ b/spring-cloud-app-broker-integration-tests/build.gradle @@ -20,16 +20,13 @@ plugins { description = "Spring Cloud App Broker Integration Tests" -// don't publish the jar for this module -configurations.archives.artifacts.clear() - dependencies { implementation project(":spring-cloud-starter-app-broker-cloudfoundry") - implementation("org.springframework.boot:spring-boot-starter-webflux") + implementation "org.springframework.boot:spring-boot-starter-webflux" - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("io.rest-assured:rest-assured") - testImplementation("com.github.tomakehurst:wiremock:${wiremockVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "io.rest-assured:rest-assured" + testImplementation "com.github.tomakehurst:wiremock:${wiremockVersion}" } test { diff --git a/spring-cloud-app-broker-security-credhub/build.gradle b/spring-cloud-app-broker-security-credhub/build.gradle index d7fc768..44bcc25 100644 --- a/spring-cloud-app-broker-security-credhub/build.gradle +++ b/spring-cloud-app-broker-security-credhub/build.gradle @@ -24,13 +24,13 @@ dependencyManagement { dependencies { implementation project(":spring-cloud-app-broker-core") - implementation("org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}") - implementation("org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}") + implementation "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}" + implementation "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}" - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly "org.junit.platform:junit-platform-launcher" - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("org.springframework.boot:spring-boot-starter-webflux") - testImplementation("io.projectreactor:reactor-test") - testImplementation("io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}") + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.springframework.boot:spring-boot-starter-webflux" + testImplementation "io.projectreactor:reactor-test" + testImplementation "io.projectreactor.tools:blockhound-junit-platform:${blockHoundVersion}" }