Skip to content

Commit 5e90415

Browse files
committed
Rationalize starters following modularization
Update dependencies and starters following modularization. New starters have been added for each user-facing module. Closes gh-46245
1 parent 548b44f commit 5e90415

File tree

146 files changed

+975
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+975
-170
lines changed

documentation/spring-boot-docs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ dependencies {
380380
testImplementation(project(":module:spring-boot-actuator-autoconfigure"))
381381
testImplementation(project(":test-support:spring-boot-test-support"))
382382

383-
testRuntimeOnly(project(":starter:spring-boot-starter-web"))
383+
testRuntimeOnly(project(":starter:spring-boot-starter-webmvc"))
384384
testRuntimeOnly("com.h2database:h2")
385385
testRuntimeOnly("org.springframework:spring-jdbc")
386386

integration-test/spring-boot-sni-integration-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
app project(path: ":module:spring-boot-webflux", configuration: "mavenRepository")
3939

4040
intTestImplementation(enforcedPlatform(project(":platform:spring-boot-internal-dependencies")))
41-
intTestImplementation(project(":starter:spring-boot-starter-web"))
41+
intTestImplementation(project(":starter:spring-boot-starter-webmvc"))
4242
intTestImplementation(project(":test-support:spring-boot-test-support"))
4343
intTestImplementation(project(":starter:spring-boot-starter-test"))
4444
intTestImplementation("org.testcontainers:junit-jupiter")

module/spring-boot-data-cassandra/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ description = "Spring Boot Data Cassandra"
2828
dependencies {
2929
api(project(":module:spring-boot-cassandra"))
3030
api(project(":module:spring-boot-data-commons"))
31-
api("org.springframework.data:spring-data-cassandra") {
32-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
33-
}
31+
api("org.springframework.data:spring-data-cassandra")
3432

3533
optional(project(":core:spring-boot-autoconfigure"))
3634
optional(project(":module:spring-boot-reactor"))

module/spring-boot-data-commons/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ plugins {
2525
description = "Spring Boot Data Commons"
2626

2727
dependencies {
28-
api(project(":module:spring-boot-webmvc"))
28+
api(project(":core:spring-boot"))
2929
api("org.springframework.data:spring-data-commons")
3030

3131
optional(project(":core:spring-boot-autoconfigure"))
3232
optional(project(":module:spring-boot-metrics"))
33+
optional(project(":module:spring-boot-webmvc"))
3334

3435
testImplementation(project(":core:spring-boot-test"))
3536
testImplementation(project(":module:spring-boot-jdbc"))

module/spring-boot-data-couchbase/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ description = "Spring Boot Data Couchbase"
2727
dependencies {
2828
api(project(":module:spring-boot-couchbase"))
2929
api(project(":module:spring-boot-data-commons"))
30+
api(project(":module:spring-boot-tx"))
3031
api("org.springframework.data:spring-data-couchbase")
3132

3233
optional(project(":core:spring-boot-autoconfigure"))

module/spring-boot-data-elasticsearch/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ description = "Spring Boot Data Elasticsearch"
2828
dependencies {
2929
api(project(":module:spring-boot-data-commons"))
3030
api(project(":module:spring-boot-elasticsearch"))
31+
api(project(":module:spring-boot-tx"))
3132
api("org.springframework.data:spring-data-elasticsearch")
3233

3334
optional(project(":core:spring-boot-autoconfigure"))

module/spring-boot-data-jpa/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ dependencies {
4040

4141
testImplementation(project(":core:spring-boot-test"))
4242
testImplementation(project(":module:spring-boot-jdbc"))
43+
testImplementation(project(":module:spring-boot-webmvc"))
4344
testImplementation(project(":test-support:spring-boot-test-support"))
4445
testImplementation(testFixtures(project(":core:spring-boot-autoconfigure")))
4546

module/spring-boot-data-ldap/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ description = "Spring Boot Data LDAP"
2727
dependencies {
2828
api(project(":module:spring-boot-data-commons"))
2929
api(project(":module:spring-boot-ldap"))
30+
api(project(":module:spring-boot-tx"))
3031
api("org.springframework.data:spring-data-ldap")
3132

3233
optional(project(":core:spring-boot-autoconfigure"))

module/spring-boot-data-mongodb/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ plugins {
2525
description = "Spring Boot Data MongoDB"
2626

2727
dependencies {
28-
api(project(":core:spring-boot"))
2928
api(project(":module:spring-boot-data-commons"))
3029
api(project(":module:spring-boot-mongodb"))
30+
api(project(":module:spring-boot-tx"))
3131
api("org.springframework.data:spring-data-mongodb")
3232

3333
compileOnly("com.fasterxml.jackson.core:jackson-annotations")

module/spring-boot-data-redis/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ description = "Spring Boot Data Redis"
2828
dependencies {
2929
api(project(":core:spring-boot"))
3030
api(project(":module:spring-boot-data-commons"))
31+
api(project(":module:spring-boot-tx"))
3132
api("io.lettuce:lettuce-core")
3233
api("org.springframework.data:spring-data-redis")
3334

0 commit comments

Comments
 (0)