From 37832be5d004ae45667ff3d642cb9feb0e797714 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 13 Jul 2023 15:50:22 +0200 Subject: [PATCH 1/2] 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 2/2] 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"