Browse Source

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

This reverts commit 06f5ab162f. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
3.1.x
Andy Wilkinson 2 years ago
parent
commit
3b76165f4e
  1. 4
      spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
  2. 4
      spring-boot-project/spring-boot-actuator/build.gradle
  3. 4
      spring-boot-project/spring-boot-autoconfigure/build.gradle
  4. 4
      spring-boot-project/spring-boot-docs/build.gradle
  5. 4
      spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle
  6. 4
      spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle
  7. 4
      spring-boot-project/spring-boot-test-autoconfigure/build.gradle

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

@ -123,9 +123,7 @@ dependencies { @@ -123,9 +123,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

@ -66,9 +66,7 @@ dependencies { @@ -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

@ -155,9 +155,7 @@ dependencies { @@ -155,9 +155,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

@ -132,9 +132,7 @@ dependencies { @@ -132,9 +132,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

@ -7,7 +7,5 @@ description = "Starter for using Couchbase document-oriented database and Spring @@ -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

@ -6,7 +6,5 @@ description = "Starter for using Couchbase document-oriented database and Spring @@ -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

@ -38,9 +38,7 @@ dependencies { @@ -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")

Loading…
Cancel
Save