Skip to content

Commit f9a6b9a

Browse files
committed
API scope, Boot BOM
* Make just about everything API scope, apart from commons-text * Also use Spring Boot BOM to manage Spring Framework and Reactor versions in core subproject
1 parent fac4292 commit f9a6b9a

File tree

10 files changed

+34
-41
lines changed

10 files changed

+34
-41
lines changed

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ ext {
2828
] as String[]
2929
}
3030

31-
// override managed Spring Boot versions
32-
ext['spring-framework.version'] = springFrameworkVersion
33-
ext['reactor-bom.version'] = reactorVersion
34-
3531
description = "Spring Cloud App Broker"
3632

3733
allprojects {

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ junitPlatformLauncherVersion = 1.6.2
1515
mockitoVersion = 3.1.0
1616
openServiceBrokerVersion = 3.1.1.RELEASE
1717
pmdVersion = 6.24.0
18-
reactorVersion = Dysprosium-SR7
1918
springBootVersion = 2.3.1.RELEASE
2019
springCredhubVersion = 2.1.1.RELEASE
2120
springFrameworkVersion = 5.2.7.RELEASE

spring-cloud-app-broker-acceptance-tests/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ plugins {
2121
description = "Spring Cloud App Broker Acceptance Tests"
2222

2323
dependencies {
24-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
25-
implementation project(":spring-cloud-starter-app-broker-cloudfoundry")
26-
implementation "org.springframework.boot:spring-boot-starter-webflux"
24+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
25+
api project(":spring-cloud-starter-app-broker-cloudfoundry")
26+
api "org.springframework.boot:spring-boot-starter-webflux"
2727

2828
testImplementation "org.springframework.boot:spring-boot-starter-test"
2929
testImplementation "io.projectreactor:reactor-test"

spring-cloud-app-broker-autoconfigure/build.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,15 @@ dependencies {
2727
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
2828
annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor"
2929

30-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
31-
implementation project(":spring-cloud-app-broker-core")
32-
implementation project(":spring-cloud-app-broker-deployer")
33-
implementation project(":spring-cloud-app-broker-deployer-cloudfoundry")
34-
implementation project(":spring-cloud-app-broker-security-credhub")
35-
implementation "org.springframework.boot:spring-boot-starter"
36-
implementation "org.springframework.boot:spring-boot-starter-webflux"
37-
implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
38-
implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
39-
implementation "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}"
30+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
31+
api project(":spring-cloud-app-broker-core")
32+
api project(":spring-cloud-app-broker-deployer")
33+
api project(":spring-cloud-app-broker-deployer-cloudfoundry")
34+
api project(":spring-cloud-app-broker-security-credhub")
35+
api "org.springframework.boot:spring-boot-starter"
36+
api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
37+
api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
38+
api "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}"
4039

4140
loggingImplementation project(":spring-cloud-app-broker-logging")
4241

spring-cloud-app-broker-core/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ dependencies {
2020
api project(":spring-cloud-app-broker-deployer")
2121
api "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}"
2222

23-
implementation enforcedPlatform("org.springframework:spring-framework-bom:${springFrameworkVersion}")
24-
implementation enforcedPlatform("io.projectreactor:reactor-bom:${reactorVersion}")
25-
implementation "org.springframework:spring-core"
26-
implementation "org.springframework:spring-context"
27-
implementation "io.projectreactor:reactor-core"
23+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
24+
api "org.springframework:spring-core"
25+
api "org.springframework:spring-context"
26+
api "io.projectreactor:reactor-core"
27+
2828
implementation "org.apache.commons:commons-text:${commonsTextVersion}"
2929

3030
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"

spring-cloud-app-broker-deployer-cloudfoundry/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
description = "Spring Cloud App Broker Deployer Cloud Foundry"
1818

1919
dependencies {
20-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21-
implementation project(":spring-cloud-app-broker-deployer")
22-
implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
23-
implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
24-
implementation "org.springframework.boot:spring-boot-starter-validation"
20+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21+
api project(":spring-cloud-app-broker-deployer")
22+
api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
23+
api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
24+
api "org.springframework.boot:spring-boot-starter-validation"
2525

2626
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2727

spring-cloud-app-broker-deployer/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
description = "Spring Cloud App Broker Deployer"
1818

1919
dependencies {
20-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21-
implementation "org.springframework:spring-core"
22-
implementation "io.projectreactor:reactor-core"
20+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21+
api "org.springframework:spring-core"
22+
api "io.projectreactor:reactor-core"
2323

2424
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2525

spring-cloud-app-broker-logging/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
description = "Spring Cloud App Broker Logging"
1818

1919
dependencies {
20-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21-
implementation "org.springframework.boot:spring-boot-starter-webflux"
22-
implementation "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
23-
implementation "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
20+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21+
api "org.springframework.boot:spring-boot-starter-webflux"
22+
api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
23+
api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
2424

2525
testImplementation project(":spring-cloud-starter-app-broker-logging")
2626
testImplementation "org.springframework.boot:spring-boot-starter-test"

spring-cloud-app-broker-security-credhub/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
description = "Spring Cloud App Broker Security CredHub"
1818

1919
dependencies {
20-
implementation enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21-
implementation project(":spring-cloud-app-broker-core")
22-
implementation "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}"
23-
implementation "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}"
20+
api enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
21+
api project(":spring-cloud-app-broker-core")
22+
api "org.springframework.credhub:spring-credhub-starter:${springCredhubVersion}"
23+
api "org.springframework.cloud:spring-cloud-open-service-broker-core:${openServiceBrokerVersion}"
2424

2525
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2626

spring-cloud-starter-app-broker-cloudfoundry/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ description = "Spring Cloud App Broker Starter for Cloud Foundry"
1919
dependencies {
2020
api project(":spring-cloud-starter-app-broker")
2121
api project(":spring-cloud-app-broker-deployer-cloudfoundry")
22+
api project(":spring-cloud-app-broker-security-credhub")
2223
api "org.cloudfoundry:cloudfoundry-client-reactor:${cfJavaClientVersion}"
2324
api "org.cloudfoundry:cloudfoundry-operations:${cfJavaClientVersion}"
24-
25-
implementation project(":spring-cloud-app-broker-security-credhub")
2625
}
2726

0 commit comments

Comments
 (0)