mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '3.1.x' into 3.2.x
See gh-40212
This commit is contained in:
commit
3bb7baf90f
@ -124,7 +124,9 @@ dependencies {
|
||||
optional("org.springframework.data:spring-data-cassandra") {
|
||||
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
||||
}
|
||||
optional("org.springframework.data:spring-data-couchbase")
|
||||
optional("org.springframework.data:spring-data-couchbase") {
|
||||
exclude(group: "javax.inject", module: "javax.inject")
|
||||
}
|
||||
optional("org.springframework.data:spring-data-jpa")
|
||||
optional("org.springframework.data:spring-data-ldap")
|
||||
optional("org.springframework.data:spring-data-mongodb")
|
||||
|
@ -66,7 +66,9 @@ dependencies {
|
||||
optional("org.springframework.data:spring-data-cassandra") {
|
||||
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
||||
}
|
||||
optional("org.springframework.data:spring-data-couchbase")
|
||||
optional("org.springframework.data:spring-data-couchbase") {
|
||||
exclude(group: "javax.inject", module: "javax.inject")
|
||||
}
|
||||
optional("org.springframework.data:spring-data-elasticsearch") {
|
||||
exclude(group: "commons-logging", module: "commons-logging")
|
||||
}
|
||||
|
@ -147,7 +147,9 @@ 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")
|
||||
optional("org.springframework.data:spring-data-couchbase") {
|
||||
exclude(group: "javax.inject", module: "javax.inject")
|
||||
}
|
||||
optional("org.springframework.data:spring-data-envers") {
|
||||
exclude group: "javax.activation", module: "javax.activation-api"
|
||||
exclude group: "javax.persistence", module: "javax.persistence-api"
|
||||
|
@ -145,7 +145,9 @@ 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")
|
||||
implementation("org.springframework.data:spring-data-couchbase") {
|
||||
exclude group: "javax.inject", module: "javax.inject"
|
||||
}
|
||||
implementation("org.springframework.data:spring-data-elasticsearch") {
|
||||
exclude group: "commons-logging", module: "commons-logging"
|
||||
}
|
||||
|
@ -7,5 +7,7 @@ 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")
|
||||
api("org.springframework.data:spring-data-couchbase") {
|
||||
exclude group: "javax.inject", module: "javax.inject"
|
||||
}
|
||||
}
|
||||
|
@ -6,5 +6,7 @@ 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")
|
||||
api("org.springframework.data:spring-data-couchbase") {
|
||||
exclude group: "javax.inject", module: "javax.inject"
|
||||
}
|
||||
}
|
||||
|
@ -38,7 +38,9 @@ dependencies {
|
||||
optional("org.springframework.data:spring-data-cassandra") {
|
||||
exclude group: "org.slf4j", module: "jcl-over-slf4j"
|
||||
}
|
||||
optional("org.springframework.data:spring-data-couchbase")
|
||||
optional("org.springframework.data:spring-data-couchbase") {
|
||||
exclude group: "javax.inject", module: "javax.inject"
|
||||
}
|
||||
optional("org.springframework.data:spring-data-elasticsearch")
|
||||
optional("org.springframework.data:spring-data-jdbc")
|
||||
optional("org.springframework.data:spring-data-jpa")
|
||||
|
Loading…
Reference in New Issue
Block a user