diff --git a/build.gradle b/build.gradle index 778e552..856d4e3 100644 --- a/build.gradle +++ b/build.gradle @@ -28,10 +28,6 @@ ext { ] as String[] } -// override managed Spring Boot versions -ext['spring-framework.version'] = springFrameworkVersion -ext['reactor-bom.version'] = reactorVersion - description = "Spring Cloud App Broker" allprojects { diff --git a/gradle.properties b/gradle.properties index 0fa6f5a..213baaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ junitPlatformLauncherVersion = 1.6.2 mockitoVersion = 3.1.0 openServiceBrokerVersion = 3.1.1.RELEASE pmdVersion = 6.24.0 -reactorVersion = Dysprosium-SR7 springBootVersion = 2.3.1.RELEASE springCredhubVersion = 2.1.1.RELEASE springFrameworkVersion = 5.2.7.RELEASE diff --git a/spring-cloud-app-broker-acceptance-tests/build.gradle b/spring-cloud-app-broker-acceptance-tests/build.gradle index f4dc985..86ab446 100644 --- a/spring-cloud-app-broker-acceptance-tests/build.gradle +++ b/spring-cloud-app-broker-acceptance-tests/build.gradle @@ -21,9 +21,9 @@ plugins { description = "Spring Cloud App Broker Acceptance Tests" dependencies { - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation project(":spring-cloud-starter-app-broker-cloudfoundry") - implementation "org.springframework.boot:spring-boot-starter-webflux" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api project(":spring-cloud-starter-app-broker-cloudfoundry") + api "org.springframework.boot:spring-boot-starter-webflux" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "io.projectreactor:reactor-test" diff --git a/spring-cloud-app-broker-autoconfigure/build.gradle b/spring-cloud-app-broker-autoconfigure/build.gradle index 032c379..3fedeee 100644 --- a/spring-cloud-app-broker-autoconfigure/build.gradle +++ b/spring-cloud-app-broker-autoconfigure/build.gradle @@ -27,16 +27,15 @@ dependencies { annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor" - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - 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}" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api project(":spring-cloud-app-broker-core") + api project(":spring-cloud-app-broker-deployer") + api project(":spring-cloud-app-broker-deployer-cloudfoundry") + api project(":spring-cloud-app-broker-security-credhub") + api "org.springframework.boot:spring-boot-starter" + api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" + api "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}" loggingImplementation project(":spring-cloud-app-broker-logging") diff --git a/spring-cloud-app-broker-core/build.gradle b/spring-cloud-app-broker-core/build.gradle index 132da88..bc696e1 100644 --- a/spring-cloud-app-broker-core/build.gradle +++ b/spring-cloud-app-broker-core/build.gradle @@ -20,11 +20,11 @@ dependencies { api project(":spring-cloud-app-broker-deployer") api "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}" - implementation enforcedPlatform("org.springframework:spring-framework-bom:${springFrameworkVersion}") - implementation enforcedPlatform("io.projectreactor:reactor-bom:${reactorVersion}") - implementation "org.springframework:spring-core" - implementation "org.springframework:spring-context" - implementation "io.projectreactor:reactor-core" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api "org.springframework:spring-core" + api "org.springframework:spring-context" + api "io.projectreactor:reactor-core" + implementation "org.apache.commons:commons-text:${commonsTextVersion}" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}" diff --git a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle index de15faa..1d713a0 100644 --- a/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle +++ b/spring-cloud-app-broker-deployer-cloudfoundry/build.gradle @@ -17,11 +17,11 @@ description = "Spring Cloud App Broker Deployer Cloud Foundry" dependencies { - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - 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" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api project(":spring-cloud-app-broker-deployer") + api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" + api "org.springframework.boot:spring-boot-starter-validation" testRuntimeOnly "org.junit.platform:junit-platform-launcher" diff --git a/spring-cloud-app-broker-deployer/build.gradle b/spring-cloud-app-broker-deployer/build.gradle index e2beb6f..57233a2 100644 --- a/spring-cloud-app-broker-deployer/build.gradle +++ b/spring-cloud-app-broker-deployer/build.gradle @@ -17,9 +17,9 @@ description = "Spring Cloud App Broker Deployer" dependencies { - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation "org.springframework:spring-core" - implementation "io.projectreactor:reactor-core" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api "org.springframework:spring-core" + api "io.projectreactor:reactor-core" testRuntimeOnly "org.junit.platform:junit-platform-launcher" diff --git a/spring-cloud-app-broker-logging/build.gradle b/spring-cloud-app-broker-logging/build.gradle index 6c877f9..de447a6 100644 --- a/spring-cloud-app-broker-logging/build.gradle +++ b/spring-cloud-app-broker-logging/build.gradle @@ -17,10 +17,10 @@ description = "Spring Cloud App Broker Logging" dependencies { - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - implementation "org.springframework.boot:spring-boot-starter-webflux" - implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" - implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api "org.springframework.boot:spring-boot-starter-webflux" + api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" + api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" testImplementation project(":spring-cloud-starter-app-broker-logging") testImplementation "org.springframework.boot:spring-boot-starter-test" diff --git a/spring-cloud-app-broker-security-credhub/build.gradle b/spring-cloud-app-broker-security-credhub/build.gradle index f24a2c7..c84d27d 100644 --- a/spring-cloud-app-broker-security-credhub/build.gradle +++ b/spring-cloud-app-broker-security-credhub/build.gradle @@ -17,10 +17,10 @@ description = "Spring Cloud App Broker Security CredHub" dependencies { - implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") - 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}" + api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}") + api project(":spring-cloud-app-broker-core") + api "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}" + api "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}" testRuntimeOnly "org.junit.platform:junit-platform-launcher" diff --git a/spring-cloud-starter-app-broker-cloudfoundry/build.gradle b/spring-cloud-starter-app-broker-cloudfoundry/build.gradle index 45c4cba..a42a981 100644 --- a/spring-cloud-starter-app-broker-cloudfoundry/build.gradle +++ b/spring-cloud-starter-app-broker-cloudfoundry/build.gradle @@ -19,9 +19,8 @@ description = "Spring Cloud App Broker Starter for Cloud Foundry" dependencies { api project(":spring-cloud-starter-app-broker") api project(":spring-cloud-app-broker-deployer-cloudfoundry") + api project(":spring-cloud-app-broker-security-credhub") api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}" api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}" - - implementation project(":spring-cloud-app-broker-security-credhub") }