Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""

This reverts commit 3b76165f4e.

Turns out, the exclude's still needed for now? with Data Couchbase
5.1.x.

See gh-40200
This commit is contained in:
Andy Wilkinson 2024-04-11 17:06:03 +01:00
parent 3b76165f4e
commit 1ea6f2f51f
7 changed files with 21 additions and 7 deletions

View File

@ -123,7 +123,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")

View File

@ -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")
}

View File

@ -155,7 +155,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"

View File

@ -132,7 +132,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"
}

View File

@ -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"
}
}

View File

@ -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"
}
}

View File

@ -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")