From 546925096820928dc6ad24695a9caccd2139e93b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:07 +0100 Subject: [PATCH 1/7] Upgrade to Jakarta XML SOAP 3.0.2 Closes gh-40776 --- 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 f50a338f8f0..ba5e57bd897 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -580,7 +580,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 237b288c7899581a0ea7171bc074039b6a5bf2fb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:11 +0100 Subject: [PATCH 2/7] Upgrade to Jakarta XML WS 4.0.2 Closes gh-40777 --- 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 ba5e57bd897..2619de5f5ec 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -587,7 +587,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 d0cac7d7366643fe05d5ce101d7f6c5e66b8b20d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:16 +0100 Subject: [PATCH 3/7] Upgrade to Jetty 11.0.21 Closes gh-40778 --- 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 2619de5f5ec..9efa7a797f0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -666,7 +666,7 @@ bom { ] } } - library("Jetty", "11.0.20") { + library("Jetty", "11.0.21") { group("org.eclipse.jetty") { imports = [ "jetty-bom" From 347295c081b99b87583f1fe5e2e107f063dfe66d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:17 +0100 Subject: [PATCH 4/7] Upgrade to Reactor Bom 2022.0.19 Closes gh-40647 --- 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 9efa7a797f0..13799e333ad 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1273,7 +1273,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.19-SNAPSHOT") { + library("Reactor Bom", "2022.0.19") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From 219fc8a1592703c7e574ceabde5ee6716401e8fb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:21 +0100 Subject: [PATCH 5/7] Upgrade to SAAJ Impl 3.0.4 Closes gh-40779 --- 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 13799e333ad..7128882c60f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1386,7 +1386,7 @@ bom { ] } } - library("SAAJ Impl", "3.0.3") { + library("SAAJ Impl", "3.0.4") { group("com.sun.xml.messaging.saaj") { modules = [ "saaj-impl" From 3ad932c90797ea1b057100efade97b5c57421067 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:22 +0100 Subject: [PATCH 6/7] Upgrade to Spring Framework 6.0.20 Closes gh-40650 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9827adeb34b..fcc49a58b68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ junitJupiterVersion=5.9.3 kotlinVersion=1.8.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 -springFrameworkVersion=6.0.20-SNAPSHOT +springFrameworkVersion=6.0.20 tomcatVersion=10.1.23 kotlin.stdlib.default.dependency=false From edd45de17fc0705f405ac4a0747d4ec574bf8a15 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 16 May 2024 14:18:28 +0100 Subject: [PATCH 7/7] Upgrade to Tomcat 10.1.24 Closes gh-40780 --- 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 fcc49a58b68..928605b83ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ kotlinVersion=1.8.22 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.0.20 -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 acfe9c3ba37..f859ef7daee 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" } }