Skip to content

Commit 1ea6f2f

Browse files
committed
Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""
This reverts commit 3b76165. Turns out, the exclude's still needed for now? with Data Couchbase 5.1.x. See gh-40200
1 parent 3b76165 commit 1ea6f2f

File tree

7 files changed

+21
-7
lines changed

7 files changed

+21
-7
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ 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")
126+
optional("org.springframework.data:spring-data-couchbase") {
127+
exclude(group: "javax.inject", module: "javax.inject")
128+
}
127129
optional("org.springframework.data:spring-data-jpa")
128130
optional("org.springframework.data:spring-data-ldap")
129131
optional("org.springframework.data:spring-data-mongodb")

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ 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")
69+
optional("org.springframework.data:spring-data-couchbase") {
70+
exclude(group: "javax.inject", module: "javax.inject")
71+
}
7072
optional("org.springframework.data:spring-data-elasticsearch") {
7173
exclude(group: "commons-logging", module: "commons-logging")
7274
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ 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")
158+
optional("org.springframework.data:spring-data-couchbase") {
159+
exclude(group: "javax.inject", module: "javax.inject")
160+
}
159161
optional("org.springframework.data:spring-data-envers") {
160162
exclude group: "javax.activation", module: "javax.activation-api"
161163
exclude group: "javax.persistence", module: "javax.persistence-api"

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@ 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")
135+
implementation("org.springframework.data:spring-data-couchbase") {
136+
exclude group: "javax.inject", module: "javax.inject"
137+
}
136138
implementation("org.springframework.data:spring-data-elasticsearch") {
137139
exclude group: "commons-logging", module: "commons-logging"
138140
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ 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")
10+
api("org.springframework.data:spring-data-couchbase") {
11+
exclude group: "javax.inject", module: "javax.inject"
12+
}
1113
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ 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")
9+
api("org.springframework.data:spring-data-couchbase") {
10+
exclude group: "javax.inject", module: "javax.inject"
11+
}
1012
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ 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")
41+
optional("org.springframework.data:spring-data-couchbase") {
42+
exclude group: "javax.inject", module: "javax.inject"
43+
}
4244
optional("org.springframework.data:spring-data-elasticsearch")
4345
optional("org.springframework.data:spring-data-jdbc")
4446
optional("org.springframework.data:spring-data-jpa")

0 commit comments

Comments
 (0)