Skip to content

Commit 3b76165

Browse files
committed
Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab1. The dependency has been removed in Data Couchbase, making the exclude unnecessary. See gh-40200
1 parent a417c94 commit 3b76165

File tree

7 files changed

+7
-21
lines changed

7 files changed

+7
-21
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ dependencies {
123123
optional("org.springframework.data:spring-data-cassandra") {
124124
exclude group: "org.slf4j", module: "jcl-over-slf4j"
125125
}
126-
optional("org.springframework.data:spring-data-couchbase") {
127-
exclude(group: "javax.inject", module: "javax.inject")
128-
}
126+
optional("org.springframework.data:spring-data-couchbase")
129127
optional("org.springframework.data:spring-data-jpa")
130128
optional("org.springframework.data:spring-data-ldap")
131129
optional("org.springframework.data:spring-data-mongodb")

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ dependencies {
6666
optional("org.springframework.data:spring-data-cassandra") {
6767
exclude group: "org.slf4j", module: "jcl-over-slf4j"
6868
}
69-
optional("org.springframework.data:spring-data-couchbase") {
70-
exclude(group: "javax.inject", module: "javax.inject")
71-
}
69+
optional("org.springframework.data:spring-data-couchbase")
7270
optional("org.springframework.data:spring-data-elasticsearch") {
7371
exclude(group: "commons-logging", module: "commons-logging")
7472
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ dependencies {
155155
optional("org.springframework:spring-webflux")
156156
optional("org.springframework:spring-webmvc")
157157
optional("org.springframework.batch:spring-batch-core")
158-
optional("org.springframework.data:spring-data-couchbase") {
159-
exclude(group: "javax.inject", module: "javax.inject")
160-
}
158+
optional("org.springframework.data:spring-data-couchbase")
161159
optional("org.springframework.data:spring-data-envers") {
162160
exclude group: "javax.activation", module: "javax.activation-api"
163161
exclude group: "javax.persistence", module: "javax.persistence-api"

spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ dependencies {
132132
implementation("org.springframework.amqp:spring-rabbit")
133133
implementation("org.springframework.batch:spring-batch-core")
134134
implementation("org.springframework.data:spring-data-cassandra")
135-
implementation("org.springframework.data:spring-data-couchbase") {
136-
exclude group: "javax.inject", module: "javax.inject"
137-
}
135+
implementation("org.springframework.data:spring-data-couchbase")
138136
implementation("org.springframework.data:spring-data-elasticsearch") {
139137
exclude group: "commons-logging", module: "commons-logging"
140138
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
77
dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("io.projectreactor:reactor-core")
10-
api("org.springframework.data:spring-data-couchbase") {
11-
exclude group: "javax.inject", module: "javax.inject"
12-
}
10+
api("org.springframework.data:spring-data-couchbase")
1311
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@ description = "Starter for using Couchbase document-oriented database and Spring
66

77
dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
9-
api("org.springframework.data:spring-data-couchbase") {
10-
exclude group: "javax.inject", module: "javax.inject"
11-
}
9+
api("org.springframework.data:spring-data-couchbase")
1210
}

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ dependencies {
3838
optional("org.springframework.data:spring-data-cassandra") {
3939
exclude group: "org.slf4j", module: "jcl-over-slf4j"
4040
}
41-
optional("org.springframework.data:spring-data-couchbase") {
42-
exclude group: "javax.inject", module: "javax.inject"
43-
}
41+
optional("org.springframework.data:spring-data-couchbase")
4442
optional("org.springframework.data:spring-data-elasticsearch")
4543
optional("org.springframework.data:spring-data-jdbc")
4644
optional("org.springframework.data:spring-data-jpa")

0 commit comments

Comments
 (0)