From 4d5b008b9a76bee30e17e3c95c6149f636a17c3b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:46:29 +0100 Subject: [PATCH 01/10] Upgrade to Micrometer 1.9.0 Closes gh-31013 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 816c4063c6..fb7c9be4d0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1279,7 +1279,7 @@ bom { ] } } - library("Micrometer", "1.9.0-RC1") { + library("Micrometer", "1.9.0") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 9ec1978bb1885377cab874e67f6dafe6da637552 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:47:15 +0100 Subject: [PATCH 02/10] Upgrade to Spring Framework 5.3.20 Closes gh-31014 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index fb7c9be4d0..322dc6a90f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1700,7 +1700,7 @@ bom { ] } } - library("Spring Framework", "5.3.19") { + library("Spring Framework", "5.3.20") { prohibit("[6.0.0-M1,)") { because "we upgrade in Spring Boot 3.x" } From a5b7bb518e57f9bfc78d589d63ce15e16defdc33 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:48:00 +0100 Subject: [PATCH 03/10] 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") } From 22d5ce2380a40f58d8081d956b54dfa6cc1c568a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:48:42 +0100 Subject: [PATCH 04/10] Upgrade to Spring HATEOAS 1.5.0 Closes gh-31016 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e7b7cbc872..0f3d21c19f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1718,7 +1718,7 @@ bom { ] } } - library("Spring HATEOAS", "1.5.0-RC1") { + library("Spring HATEOAS", "1.5.0") { prohibit("[2.0.0-M1,)") { because "it uses Spring Framework 6" } From f7b55ecec384f9b785835e3e95f53f6b70e120c7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:49:31 +0100 Subject: [PATCH 05/10] Start building against Spring LDAP 2.4.0 snapshots See gh-31017 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 0f3d21c19f..faec4dd480 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1749,7 +1749,7 @@ bom { ] } } - library("Spring LDAP", "2.4.0-RC1") { + library("Spring LDAP", "2.4.0-SNAPSHOT") { prohibit("[3.0.0-M1,)") { because "it uses Spring Framework 6" } From a24e8b95f861f8bcb6b19dc258f037286f52b721 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:50:04 +0100 Subject: [PATCH 06/10] Start building against Spring Kafka 2.8.6 snapshots See gh-31018 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index faec4dd480..930a07cf3a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1738,7 +1738,7 @@ bom { ] } } - library("Spring Kafka", "2.8.5") { + library("Spring Kafka", "2.8.6-SNAPSHOT") { prohibit("[3.0.0-M1,)") { because "it uses Spring Framework 6" } From 2b85bb5ca16a46480ef04575663a3c9887893345 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:50:46 +0100 Subject: [PATCH 07/10] Start building against Spring Security 5.7.0 snapshots See gh-31019 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 930a07cf3a..aef150d680 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1785,7 +1785,7 @@ bom { ] } } - library("Spring Security", "5.7.0-RC1") { + library("Spring Security", "5.7.0-SNAPSHOT") { prohibit("[6.0.0-M1,)") { because "it uses Spring Framework 6" } From dbaca5faacf9b5d4b06c2fdeeae6712fefb851be Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:51:40 +0100 Subject: [PATCH 08/10] Start building against Spring Batch 4.3.6 snapshots See gh-31020 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index aef150d680..dd65519638 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1677,7 +1677,7 @@ bom { ] } } - library("Spring Batch", "4.3.5") { + library("Spring Batch", "4.3.6-SNAPSHOT") { prohibit("[5.0.0-M1,)") { because "it uses Spring Framework 6" } From bb40582b30600f2cbfa616ca20c186627907dd4f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:52:31 +0100 Subject: [PATCH 09/10] Start building against Spring Session Bom 2021.2.0 snapshots See gh-31021 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index dd65519638..c1c3c9b569 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1795,7 +1795,7 @@ bom { ] } } - library("Spring Session Bom", "2021.2.0-RC1") { + library("Spring Session Bom", "2021.2.0-SNAPSHOT") { prohibit("[2022.0.0-M1,)") { because "it uses Spring Framework 6" } From cf4597d22aaf559e56fb69f2ba9725021c3d469a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 12 May 2022 17:53:11 +0100 Subject: [PATCH 10/10] Start building against Spring AMQP 2.4.5 snapshots See gh-31022 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index c1c3c9b569..7f76f1a00b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1663,7 +1663,7 @@ bom { ] } } - library("Spring AMQP", "2.4.4") { + library("Spring AMQP", "2.4.5-SNAPSHOT") { prohibit("[3.0.0-M1,)") { because "it uses Spring Framework 6" }