From 2d663f2e9449085e13dc90e811481b97abbb86be Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 19 Apr 2022 15:42:35 +0200 Subject: [PATCH] Upgrade to Spring Data 2021.2.0-RC1 Closes gh-30610 --- .../spring-boot-actuator-autoconfigure/build.gradle | 5 ++++- spring-boot-project/spring-boot-actuator/build.gradle | 5 ++++- spring-boot-project/spring-boot-autoconfigure/build.gradle | 5 ++++- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- spring-boot-project/spring-boot-docs/build.gradle | 5 ++++- .../spring-boot-starter-data-couchbase-reactive/build.gradle | 5 ++++- .../spring-boot-starter-data-couchbase/build.gradle | 5 ++++- .../spring-boot-test-autoconfigure/build.gradle | 5 ++++- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index e7d4d6ea8c0..80e76dbb184 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -140,7 +140,10 @@ dependencies { optional("org.springframework.data:spring-data-cassandra") { exclude group: "org.slf4j", module: "jcl-over-slf4j" } - optional("org.springframework.data:spring-data-couchbase") + optional("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } 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 fbb0194c83f..155a42b9218 100644 --- a/spring-boot-project/spring-boot-actuator/build.gradle +++ b/spring-boot-project/spring-boot-actuator/build.gradle @@ -72,7 +72,10 @@ dependencies { optional("org.springframework.data:spring-data-cassandra") { exclude group: "org.slf4j", module: "jcl-over-slf4j" } - optional("org.springframework.data:spring-data-couchbase") + optional("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } 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 9fd66ab804b..522a9287ad1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -168,7 +168,10 @@ 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") + optional("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } 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-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 55e23687a19..1454415eba6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1692,7 +1692,7 @@ bom { ] } } - library("Spring Data Bom", "2021.2.0-M4") { + library("Spring Data Bom", "2021.2.0-RC1") { prohibit("[2022.0.0-M1,)") { because "it uses Spring Framework 6" } diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 62e969f64c7..b6e674df682 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -129,7 +129,10 @@ 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") + implementation("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } 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 ec8c533472e..e2acafc5989 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 @@ -8,5 +8,8 @@ dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api("io.projectreactor:reactor-core") api("io.reactivex:rxjava-reactive-streams") - api("org.springframework.data:spring-data-couchbase") + api("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } } 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 17742429df2..ea4e031c6dd 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,5 +6,8 @@ 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") + api("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 000ab1ebfc2..e044575d4b6 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -48,7 +48,10 @@ dependencies { optional("org.springframework.data:spring-data-cassandra") { exclude group: "org.slf4j", module: "jcl-over-slf4j" } - optional("org.springframework.data:spring-data-couchbase") + optional("org.springframework.data:spring-data-couchbase") { + exclude group: "com.querydsl", module: "querydsl-apt" + exclude group: "javax.annotation", module: "javax.annotation-api" + } optional("org.springframework.data:spring-data-elasticsearch") optional("org.springframework.data:spring-data-jdbc") optional("org.springframework.data:spring-data-jpa")