Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
See gh-40212
This commit is contained in:
Andy Wilkinson 2024-04-11 16:56:22 +01:00
commit 7d3ea3f06f
7 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@ -124,9 +124,7 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase") {
exclude(group: "javax.inject", module: "javax.inject")
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-jpa")
optional("org.springframework.data:spring-data-ldap")
optional("org.springframework.data:spring-data-mongodb")

4
spring-boot-project/spring-boot-actuator/build.gradle
View File

@ -66,9 +66,7 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase") {
exclude(group: "javax.inject", module: "javax.inject")
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-elasticsearch") {
exclude(group: "commons-logging", module: "commons-logging")
}

4
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -147,9 +147,7 @@ dependencies {
optional("org.springframework:spring-webflux")
optional("org.springframework:spring-webmvc")
optional("org.springframework.batch:spring-batch-core")
optional("org.springframework.data:spring-data-couchbase") {
exclude(group: "javax.inject", module: "javax.inject")
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-envers") {
exclude group: "javax.activation", module: "javax.activation-api"
exclude group: "javax.persistence", module: "javax.persistence-api"

4
spring-boot-project/spring-boot-docs/build.gradle
View File

@ -145,9 +145,7 @@ dependencies {
implementation("org.springframework.amqp:spring-rabbit")
implementation("org.springframework.batch:spring-batch-core")
implementation("org.springframework.data:spring-data-cassandra")
implementation("org.springframework.data:spring-data-couchbase") {
exclude group: "javax.inject", module: "javax.inject"
}
implementation("org.springframework.data:spring-data-couchbase")
implementation("org.springframework.data:spring-data-elasticsearch") {
exclude group: "commons-logging", module: "commons-logging"
}

4
spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
View File

@ -7,7 +7,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("io.projectreactor:reactor-core")
api("org.springframework.data:spring-data-couchbase") {
exclude group: "javax.inject", module: "javax.inject"
}
api("org.springframework.data:spring-data-couchbase")
}

4
spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle
View File

@ -6,7 +6,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
dependencies {
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
api("org.springframework.data:spring-data-couchbase") {
exclude group: "javax.inject", module: "javax.inject"
}
api("org.springframework.data:spring-data-couchbase")
}

4
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@ -38,9 +38,7 @@ dependencies {
optional("org.springframework.data:spring-data-cassandra") {
exclude group: "org.slf4j", module: "jcl-over-slf4j"
}
optional("org.springframework.data:spring-data-couchbase") {
exclude group: "javax.inject", module: "javax.inject"
}
optional("org.springframework.data:spring-data-couchbase")
optional("org.springframework.data:spring-data-elasticsearch")
optional("org.springframework.data:spring-data-jdbc")
optional("org.springframework.data:spring-data-jpa")