From 3b76165f4e764300c58a52df9244ea9953abcc6f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 11 Apr 2024 16:55:24 +0100 Subject: [PATCH] Revert "Exclude unwanted javax.inject dependency from Data Couchbase" This reverts commit 06f5ab162f6b049f42f15c04d3a9a8810c0c6d63. The dependency has been removed in Data Couchbase, making the exclude unnecessary. See gh-40200 --- .../spring-boot-actuator-autoconfigure/build.gradle | 4 +--- spring-boot-project/spring-boot-actuator/build.gradle | 4 +--- spring-boot-project/spring-boot-autoconfigure/build.gradle | 4 +--- spring-boot-project/spring-boot-docs/build.gradle | 4 +--- .../spring-boot-starter-data-couchbase-reactive/build.gradle | 4 +--- .../spring-boot-starter-data-couchbase/build.gradle | 4 +--- .../spring-boot-test-autoconfigure/build.gradle | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 72c461af9b6..50d236750fa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -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") diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle index a0356cf4829..c4e39305917 100644 --- a/spring-boot-project/spring-boot-actuator/build.gradle +++ b/spring-boot-project/spring-boot-actuator/build.gradle @@ -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") } diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 8da55716866..3ed2730ddfe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -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" diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 398002a731f..f55df27a85a 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -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" } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle index 7a103f93818..3ae4f9bf008 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase-reactive/build.gradle +++ b/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 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") } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle index cda67ddad02..17742429df2 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/build.gradle +++ b/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 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") } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 2a520aa3433..623831519c1 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -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")