From 37832be5d004ae45667ff3d642cb9feb0e797714 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:50:22 +0200 Subject: [PATCH 01/11] Upgrade to Spring Framework 5.3.29 Closes gh-36174 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e50ecf1fe39..9ac52daf53b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.21 -springFrameworkVersion=5.3.29-SNAPSHOT +springFrameworkVersion=5.3.29 tomcatVersion=9.0.78 kotlin.stdlib.default.dependency=false From b3513b5d89c14db5e819f56d7b7b4272542a87b7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:53:13 +0200 Subject: [PATCH 02/11] Start building against Spring AMQP 2.4.14 snapshots See gh-36399 --- 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 ef834f147a4..ae99a7a3a5d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1714,7 +1714,7 @@ bom { ] } } - library("Spring AMQP", "2.4.13") { + library("Spring AMQP", "2.4.14-SNAPSHOT") { prohibit { versionRange "[3.0.0-M1,)" because "it uses Spring Framework 6" From 23653e72bee11b179f062096c5d9c04b450c9afa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:57:33 +0200 Subject: [PATCH 03/11] Upgrade to Dependency Management Plugin 1.1.1 Closes gh-36400 --- 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 3f0f87c6990..aa359ec00dc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -187,7 +187,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.1.0") { + library("Dependency Management Plugin", "1.1.1") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From fc9006f53c12760a5f2081976034665a5168b614 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:57:34 +0200 Subject: [PATCH 04/11] Upgrade to Reactor Bom 2022.0.9 Closes gh-36292 --- 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 aa359ec00dc..7d7df9944e7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1155,7 +1155,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.9-SNAPSHOT") { + library("Reactor Bom", "2022.0.9") { group("io.projectreactor") { imports = [ "reactor-bom" From 6351cdd4bf3ab9a1c55d4dc0530159a56b31fb4c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:57:35 +0200 Subject: [PATCH 05/11] Upgrade to Spring Framework 6.0.11 Closes gh-36180 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 72e132223fe..9911e17fab5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.23 -springFrameworkVersion=6.0.11-SNAPSHOT +springFrameworkVersion=6.0.11 tomcatVersion=10.1.11 kotlin.stdlib.default.dependency=false From fbde75e14968ef6e093ea38aff2e893d54e2e492 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:01:59 +0200 Subject: [PATCH 06/11] Start building against Spring AMQP 3.0.6 snapshots See gh-36401 --- 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 7d7df9944e7..37e8734ca64 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1334,7 +1334,7 @@ bom { ] } } - library("Spring AMQP", "3.0.5") { + library("Spring AMQP", "3.0.6-SNAPSHOT") { group("org.springframework.amqp") { imports = [ "spring-amqp-bom" From babfff3060fb63c38fbbde83b100c44926222411 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:04:29 +0200 Subject: [PATCH 07/11] Upgrade to Dependency Management Plugin 1.1.1 Closes gh-36402 --- 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 3d596104f73..0fb7825be11 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -223,7 +223,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.1.0") { + library("Dependency Management Plugin", "1.1.1") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From 9d0360cc1e3cb19828d18ffae292f1da8707e1c4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:04:29 +0200 Subject: [PATCH 08/11] Upgrade to Reactor Bom 2022.0.9 Closes gh-36297 --- 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 0fb7825be11..07ffda09107 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1202,7 +1202,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.9-SNAPSHOT") { + library("Reactor Bom", "2022.0.9") { group("io.projectreactor") { imports = [ "reactor-bom" From 60e7185ae6afb06dabef21006a475074e5036993 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:04:30 +0200 Subject: [PATCH 09/11] Upgrade to Spring Framework 6.0.11 Closes gh-36185 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 41097a677e0..c49004089b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.8.22 nativeBuildToolsVersion=0.9.23 -springFrameworkVersion=6.0.11-SNAPSHOT +springFrameworkVersion=6.0.11 tomcatVersion=10.1.11 kotlin.stdlib.default.dependency=false From f6b96040add4cd0326f8343555deac3ae596ac99 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:06:42 +0200 Subject: [PATCH 10/11] Start building against Spring AMQP 3.0.6 snapshots See gh-36403 --- 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 07ffda09107..5da0abde4ce 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1365,7 +1365,7 @@ bom { ] } } - library("Spring AMQP", "3.0.5") { + library("Spring AMQP", "3.0.6-SNAPSHOT") { group("org.springframework.amqp") { imports = [ "spring-amqp-bom" From 9f462546e830760962a2f3a4b401d000b8f1921f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 16:06:47 +0200 Subject: [PATCH 11/11] Start building against Spring Integration 6.1.2 snapshots See gh-36404 --- 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 5da0abde4ce..e0194fe3321 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1415,7 +1415,7 @@ bom { ] } } - library("Spring Integration", "6.1.1") { + library("Spring Integration", "6.1.2-SNAPSHOT") { group("org.springframework.integration") { imports = [ "spring-integration-bom"