From a5b7bb518e57f9bfc78d589d63ce15e16defdc33 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:48:00 +0100 Subject: [PATCH] Start building against Spring Data Bom 2021.2.0 snapshots See gh-31015 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starter-data-couchbase-reactive/build.gradle | 5 +---- .../spring-boot-starter-data-couchbase/build.gradle | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 322dc6a90f..e7b7cbc872 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1690,7 +1690,7 @@ bom { ] } } - library("Spring Data Bom", "2021.2.0-RC1") { + library("Spring Data Bom", "2021.2.0-SNAPSHOT") { prohibit("[2022.0.0-M1,)") { because "it uses Spring Framework 6" } 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 e2acafc598..ec8c533472 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,8 +8,5 @@ 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") { - exclude group: "com.querydsl", module: "querydsl-apt" - exclude group: "javax.annotation", module: "javax.annotation-api" - } + 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 ea4e031c6d..17742429df 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,8 +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: "com.querydsl", module: "querydsl-apt" - exclude group: "javax.annotation", module: "javax.annotation-api" - } + api("org.springframework.data:spring-data-couchbase") }