From de17b6c3a1d7e3b136467a08058f5bcc5f654f89 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:04:58 +0100 Subject: [PATCH 1/7] Upgrade to Jakarta XML SOAP 3.0.2 Closes gh-40781 --- 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 cb8364e8bf..077698112b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -592,7 +592,7 @@ bom { ] } } - library("Jakarta XML SOAP", "3.0.1") { + library("Jakarta XML SOAP", "3.0.2") { group("jakarta.xml.soap") { modules = [ "jakarta.xml.soap-api" From d2b067ea3d7c9e112efb98f1c7b892c930974d60 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:03 +0100 Subject: [PATCH 2/7] Upgrade to Jakarta XML WS 4.0.2 Closes gh-40782 --- 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 077698112b..1e90f5986a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -599,7 +599,7 @@ bom { ] } } - library("Jakarta XML WS", "4.0.1") { + library("Jakarta XML WS", "4.0.2") { group("jakarta.xml.ws") { modules = [ "jakarta.xml.ws-api" From 5dcd9799af8f9b2000bd19d3dcdf337266d7ab4d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:04 +0100 Subject: [PATCH 3/7] Upgrade to Reactor Bom 2023.0.6 Closes gh-40656 --- 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 1e90f5986a..d9cb2606d2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1383,7 +1383,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.6-SNAPSHOT") { + library("Reactor Bom", "2023.0.6") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From 50c6df99b5712947355b742c79728bc648a4f235 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:09 +0100 Subject: [PATCH 4/7] Upgrade to SAAJ Impl 3.0.4 Closes gh-40783 --- 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 d9cb2606d2..6104dae9f7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1499,7 +1499,7 @@ bom { ] } } - library("SAAJ Impl", "3.0.3") { + library("SAAJ Impl", "3.0.4") { group("com.sun.xml.messaging.saaj") { modules = [ "saaj-impl" From c1f3f17f41572b3f381be96fc0332729648f8af9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:10 +0100 Subject: [PATCH 5/7] Upgrade to Spring Framework 6.1.7 Closes gh-40659 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 292012304d..896498bb37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ junitJupiterVersion=5.10.2 kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 -springFrameworkVersion=6.1.7-SNAPSHOT +springFrameworkVersion=6.1.7 tomcatVersion=10.1.23 kotlin.stdlib.default.dependency=false From bb8cf46a2985e5abad9f61d8ca54e80665302dd9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:15 +0100 Subject: [PATCH 6/7] Upgrade to Spring Retry 2.0.6 Closes gh-40784 --- 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 6104dae9f7..e6558ae443 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1654,7 +1654,7 @@ bom { ] } } - library("Spring Retry", "2.0.5") { + library("Spring Retry", "2.0.6") { considerSnapshots() group("org.springframework.retry") { modules = [ From f24d4e4a0688cc3d4036624e42fd7b4e7ac582ad Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 15:05:22 +0100 Subject: [PATCH 7/7] Upgrade to Tomcat 10.1.24 Closes gh-40785 --- gradle.properties | 2 +- .../spring-boot-starter-tomcat/build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 896498bb37..d2c61be8bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.7 -tomcatVersion=10.1.23 +tomcatVersion=10.1.24 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle index acfe9c3ba3..f859ef7dae 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle @@ -12,6 +12,5 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-websocket") { exclude group: "org.apache.tomcat", module: "tomcat-annotations-api" - exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } }