Skip to content

Commit

Permalink
Restore Boot 2.2's compile-scoped dependencies
Browse files Browse the repository at this point in the history
Fixes gh-21507
  • Loading branch information
wilkinsona committed Jun 3, 2020
1 parent 210e565 commit daeca9f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 18 deletions.
Expand Up @@ -23,12 +23,11 @@ dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))
api(project(":spring-boot-project:spring-boot-actuator"))

implementation(project(":spring-boot-project:spring-boot"))
implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))

implementation("com.fasterxml.jackson.core:jackson-databind")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
implementation("org.springframework:spring-core")
implementation("org.springframework:spring-context")

optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
optional("ch.qos.logback:logback-classic")
Expand Down
3 changes: 1 addition & 2 deletions spring-boot-project/spring-boot-actuator/build.gradle
Expand Up @@ -10,8 +10,7 @@ description = "Spring Boot Actuator"

dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))

implementation(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot"))

optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
optional("com.fasterxml.jackson.core:jackson-databind")
Expand Down
5 changes: 2 additions & 3 deletions spring-boot-project/spring-boot-devtools/build.gradle
Expand Up @@ -16,9 +16,8 @@ configurations {

dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))

implementation(project(":spring-boot-project:spring-boot"))
implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))

intTestDependencies(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))

Expand Down
Expand Up @@ -9,9 +9,8 @@ description = "Spring Boot Properties Migrator"

dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))

implementation(project(":spring-boot-project:spring-boot"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))

testImplementation(project(":spring-boot-project:spring-boot-test"))
testImplementation("org.junit.jupiter:junit-jupiter")
Expand Down
Expand Up @@ -10,10 +10,9 @@ description = "Spring Boot Test AutoConfigure"

dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))

implementation(project(":spring-boot-project:spring-boot"))
implementation(project(":spring-boot-project:spring-boot-test"))
implementation(project(":spring-boot-project:spring-boot-autoconfigure"))
api(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot-test"))
api(project(":spring-boot-project:spring-boot-autoconfigure"))

optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
optional("javax.json.bind:javax.json.bind-api")
Expand Down
3 changes: 1 addition & 2 deletions spring-boot-project/spring-boot-test/build.gradle
Expand Up @@ -11,8 +11,7 @@ description = "Spring Boot Test"

dependencies {
api(platform(project(":spring-boot-project:spring-boot-dependencies")))

implementation(project(":spring-boot-project:spring-boot"))
api(project(":spring-boot-project:spring-boot"))

optional(platform(project(":spring-boot-project:spring-boot-dependencies")))
optional("com.fasterxml.jackson.core:jackson-databind")
Expand Down

0 comments on commit daeca9f

Please sign in to comment.