Skip to content

Commit 2d663f2

Browse files
committed
Upgrade to Spring Data 2021.2.0-RC1
Closes gh-30610
1 parent 47bea5c commit 2d663f2

File tree

8 files changed

+29
-8
lines changed

8 files changed

+29
-8
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ dependencies {
140140
optional("org.springframework.data:spring-data-cassandra") {
141141
exclude group: "org.slf4j", module: "jcl-over-slf4j"
142142
}
143-
optional("org.springframework.data:spring-data-couchbase")
143+
optional("org.springframework.data:spring-data-couchbase") {
144+
exclude group: "com.querydsl", module: "querydsl-apt"
145+
exclude group: "javax.annotation", module: "javax.annotation-api"
146+
}
144147
optional("org.springframework.data:spring-data-jpa")
145148
optional("org.springframework.data:spring-data-ldap")
146149
optional("org.springframework.data:spring-data-mongodb")

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ dependencies {
7272
optional("org.springframework.data:spring-data-cassandra") {
7373
exclude group: "org.slf4j", module: "jcl-over-slf4j"
7474
}
75-
optional("org.springframework.data:spring-data-couchbase")
75+
optional("org.springframework.data:spring-data-couchbase") {
76+
exclude group: "com.querydsl", module: "querydsl-apt"
77+
exclude group: "javax.annotation", module: "javax.annotation-api"
78+
}
7679
optional("org.springframework.data:spring-data-elasticsearch") {
7780
exclude(group: "commons-logging", module: "commons-logging")
7881
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,10 @@ dependencies {
168168
optional("org.springframework:spring-webflux")
169169
optional("org.springframework:spring-webmvc")
170170
optional("org.springframework.batch:spring-batch-core")
171-
optional("org.springframework.data:spring-data-couchbase")
171+
optional("org.springframework.data:spring-data-couchbase") {
172+
exclude group: "com.querydsl", module: "querydsl-apt"
173+
exclude group: "javax.annotation", module: "javax.annotation-api"
174+
}
172175
optional("org.springframework.data:spring-data-envers") {
173176
exclude group: "javax.activation", module: "javax.activation-api"
174177
exclude group: "javax.persistence", module: "javax.persistence-api"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ bom {
16921692
]
16931693
}
16941694
}
1695-
library("Spring Data Bom", "2021.2.0-M4") {
1695+
library("Spring Data Bom", "2021.2.0-RC1") {
16961696
prohibit("[2022.0.0-M1,)") {
16971697
because "it uses Spring Framework 6"
16981698
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ dependencies {
129129
implementation("org.springframework.amqp:spring-rabbit")
130130
implementation("org.springframework.batch:spring-batch-core")
131131
implementation("org.springframework.data:spring-data-cassandra")
132-
implementation("org.springframework.data:spring-data-couchbase")
132+
implementation("org.springframework.data:spring-data-couchbase") {
133+
exclude group: "com.querydsl", module: "querydsl-apt"
134+
exclude group: "javax.annotation", module: "javax.annotation-api"
135+
}
133136
implementation("org.springframework.data:spring-data-elasticsearch") {
134137
exclude group: "commons-logging", module: "commons-logging"
135138
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("io.projectreactor:reactor-core")
1010
api("io.reactivex:rxjava-reactive-streams")
11-
api("org.springframework.data:spring-data-couchbase")
11+
api("org.springframework.data:spring-data-couchbase") {
12+
exclude group: "com.querydsl", module: "querydsl-apt"
13+
exclude group: "javax.annotation", module: "javax.annotation-api"
14+
}
1215
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ 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: "com.querydsl", module: "querydsl-apt"
11+
exclude group: "javax.annotation", module: "javax.annotation-api"
12+
}
1013
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ dependencies {
4848
optional("org.springframework.data:spring-data-cassandra") {
4949
exclude group: "org.slf4j", module: "jcl-over-slf4j"
5050
}
51-
optional("org.springframework.data:spring-data-couchbase")
51+
optional("org.springframework.data:spring-data-couchbase") {
52+
exclude group: "com.querydsl", module: "querydsl-apt"
53+
exclude group: "javax.annotation", module: "javax.annotation-api"
54+
}
5255
optional("org.springframework.data:spring-data-elasticsearch")
5356
optional("org.springframework.data:spring-data-jdbc")
5457
optional("org.springframework.data:spring-data-jpa")

0 commit comments

Comments
 (0)