From e947de1b236da5d9de3da54efee8a37bef97bdfa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:58:48 +0100 Subject: [PATCH 01/22] Upgrade to AspectJ 1.9.22 Closes gh-40293 --- 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 d720585a23a..630869ee7c3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -83,7 +83,7 @@ bom { ] } } - library("AspectJ", "1.9.21") { + library("AspectJ", "1.9.22") { group("org.aspectj") { modules = [ "aspectjrt", From 162980fe6a98da4a741374832cbc906b96d9be46 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:58:54 +0100 Subject: [PATCH 02/22] Upgrade to Awaitility 4.2.1 Closes gh-40294 --- 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 630869ee7c3..8e42453c769 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -99,7 +99,7 @@ bom { ] } } - library("Awaitility", "4.2.0") { + library("Awaitility", "4.2.1") { group("org.awaitility") { modules = [ "awaitility", From 71fd84595aa70f61ec9478f992b91df5a59037c9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:00 +0100 Subject: [PATCH 03/22] Upgrade to Byte Buddy 1.14.13 Closes gh-40295 --- 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 8e42453c769..b36bb311b37 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -123,7 +123,7 @@ bom { ] } } - library("Byte Buddy", "1.14.12") { + library("Byte Buddy", "1.14.13") { group("net.bytebuddy") { modules = [ "byte-buddy", From 14b5ab560a833818f91eac7b079b0a0720e8b30e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:06 +0100 Subject: [PATCH 04/22] Upgrade to Groovy 4.0.21 Closes gh-40296 --- 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 b36bb311b37..2a7164e5bf7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -339,7 +339,7 @@ bom { ] } } - library("Groovy", "4.0.20") { + library("Groovy", "4.0.21") { group("org.apache.groovy") { imports = [ "groovy-bom" From 21ad4ab1b1680553b329a38b8ede93d6e672c5f8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:13 +0100 Subject: [PATCH 05/22] Upgrade to Hazelcast 5.3.7 Closes gh-40297 --- 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 2a7164e5bf7..d90ff260849 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -369,7 +369,7 @@ bom { ] } } - library("Hazelcast", "5.3.6") { + library("Hazelcast", "5.3.7") { group("com.hazelcast") { modules = [ "hazelcast", From 9965654c4688e0bea3eeffa78f3ff870b16645b1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:19 +0100 Subject: [PATCH 06/22] Upgrade to Jakarta Json Bind 3.0.1 Closes gh-40298 --- 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 d90ff260849..de7798f610d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -514,7 +514,7 @@ bom { ] } } - library("Jakarta Json Bind", "3.0.0") { + library("Jakarta Json Bind", "3.0.1") { group("jakarta.json.bind") { modules = [ "jakarta.json.bind-api" From 28b9f401269da4a148a06eac4779eb5737022629 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:25 +0100 Subject: [PATCH 07/22] Upgrade to Jersey 3.1.6 Closes gh-40299 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starter-jersey/build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index de7798f610d..17a656603f2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -664,7 +664,7 @@ bom { ] } } - library("Jersey", "3.1.5") { + library("Jersey", "3.1.6") { group("org.glassfish.jersey") { imports = [ "jersey-bom" diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle index 5202fbe9715..1cf21387b99 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/build.gradle @@ -14,7 +14,6 @@ dependencies { api("org.glassfish.jersey.core:jersey-server") api("org.glassfish.jersey.ext:jersey-bean-validation") { exclude group: "jakarta.el", module: "jakarta.el-api" - exclude group: "org.glassfish", module: "jakarta.el" } api("org.glassfish.jersey.ext:jersey-spring6") api("org.glassfish.jersey.media:jersey-media-json-jackson") From cdc95bb92aa18a2ce68e9efc3b858141ce2f335c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:32 +0100 Subject: [PATCH 08/22] Upgrade to Jetty 12.0.8 Closes gh-40300 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starter-jetty/build.gradle | 8 ++++++-- .../web/embedded/jetty/JettyServletWebServerFactory.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 17a656603f2..5e65804956f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -678,7 +678,7 @@ bom { ] } } - library("Jetty", "12.0.7") { + library("Jetty", "12.0.8") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle index 3050b1cd5c9..09e6cb4f19b 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle @@ -11,6 +11,10 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-el") api("org.eclipse.jetty.ee10:jetty-ee10-servlets") api("org.eclipse.jetty.ee10:jetty-ee10-webapp") - api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") - api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") + api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") { + exclude group: "jakarta.el", module: "jakarta.el-api" + } + api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") { + exclude group: "jakarta.el", module: "jakarta.el-api" + } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java index f7c34851b61..127cb3758b9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java @@ -683,6 +683,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor } @Override + @SuppressWarnings({ "deprecation", "removal" }) public ReadableByteChannel newReadableByteChannel() throws IOException { return this.delegate.newReadableByteChannel(); } From 9310fdb5849cd147e878681efec9049c9bcb3872 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:38 +0100 Subject: [PATCH 09/22] Upgrade to jOOQ 3.18.14 Closes gh-40301 --- 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 5e65804956f..b66939504ee 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -697,7 +697,7 @@ bom { ] } } - library("jOOQ", "3.18.13") { + library("jOOQ", "3.18.14") { group("org.jooq") { modules = [ "jooq", From 53878560fee2719700dd05686744bd20c34d2942 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:44 +0100 Subject: [PATCH 10/22] Upgrade to Json-smart 2.5.1 Closes gh-40302 --- 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 b66939504ee..f92e362885d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -718,7 +718,7 @@ bom { ] } } - library("Json-smart", "2.5.0") { + library("Json-smart", "2.5.1") { group("net.minidev") { modules = [ "json-smart" From 61eda8d2ef166718d8b1bc791565a42fc5e0ca43 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:51 +0100 Subject: [PATCH 11/22] Upgrade to Kafka 3.6.2 Closes gh-40303 --- 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 f92e362885d..236e64e0002 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -753,7 +753,7 @@ bom { ] } } - library("Kafka", "3.6.1") { + library("Kafka", "3.6.2") { group("org.apache.kafka") { modules = [ "connect", From ae57b3eae3ed49a9180b36dfc60e9d78ad374bca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:58 +0100 Subject: [PATCH 12/22] Upgrade to Lombok 1.18.32 Closes gh-40304 --- 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 236e64e0002..7a6efa64c58 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -855,7 +855,7 @@ bom { ] } } - library("Lombok", "1.18.30") { + library("Lombok", "1.18.32") { group("org.projectlombok") { modules = [ "lombok" From 76f1af2663471ba21f914fc030e0ea5b6cf42160 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:04 +0100 Subject: [PATCH 13/22] Upgrade to Maven Invoker Plugin 3.6.1 Closes gh-40305 --- 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 7a6efa64c58..47c05ee0eb9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -939,7 +939,7 @@ bom { ] } } - library("Maven Invoker Plugin", "3.6.0") { + library("Maven Invoker Plugin", "3.6.1") { group("org.apache.maven.plugins") { plugins = [ "maven-invoker-plugin" From 2f4b4a32cd9475c3c63944f2bc9e993766b14791 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:11 +0100 Subject: [PATCH 14/22] Upgrade to Maven Source Plugin 3.3.1 Closes gh-40306 --- 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 47c05ee0eb9..0b75093b04e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -974,7 +974,7 @@ bom { ] } } - library("Maven Source Plugin", "3.3.0") { + library("Maven Source Plugin", "3.3.1") { group("org.apache.maven.plugins") { plugins = [ "maven-source-plugin" From 03ba263ce369935e22952f0a40ce78b5ed4dc74b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:14 +0100 Subject: [PATCH 15/22] Upgrade to Micrometer 1.12.5 Closes gh-40207 --- 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 0b75093b04e..8f9d09ec9c9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -995,7 +995,7 @@ bom { ] } } - library("Micrometer", "1.12.5-SNAPSHOT") { + library("Micrometer", "1.12.5") { considerSnapshots() group("io.micrometer") { modules = [ From 9ff51a636414609d2ab9142680b9cf8e0cefcb3b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:16 +0100 Subject: [PATCH 16/22] Upgrade to Micrometer Tracing 1.2.5 Closes gh-40208 --- 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 8f9d09ec9c9..4925506dca5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1008,7 +1008,7 @@ bom { ] } } - library("Micrometer Tracing", "1.2.5-SNAPSHOT") { + library("Micrometer Tracing", "1.2.5") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From 6c70cf2bd8703f45161736c9e0134692bd68f928 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:22 +0100 Subject: [PATCH 17/22] Upgrade to MongoDB 4.11.2 Closes gh-40307 --- 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 4925506dca5..476be5fe723 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1024,7 +1024,7 @@ bom { ] } } - library("MongoDB", "4.11.1") { + library("MongoDB", "4.11.2") { group("org.mongodb") { modules = [ "bson", From c8aabbaafb9b206c371f1b11d4ac929344afb125 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:28 +0100 Subject: [PATCH 18/22] Upgrade to Netty 4.1.108.Final Closes gh-40308 --- 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 476be5fe723..018f195a6c6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1081,7 +1081,7 @@ bom { ] } } - library("Netty", "4.1.107.Final") { + library("Netty", "4.1.108.Final") { group("io.netty") { imports = [ "netty-bom" From dac77270139a5fda7f97167599519593b7a1acc4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:35 +0100 Subject: [PATCH 19/22] Upgrade to R2DBC Postgresql 1.0.5.RELEASE Closes gh-40309 --- 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 018f195a6c6..a4f77a6c473 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1282,7 +1282,7 @@ bom { ] } } - library("R2DBC Postgresql", "1.0.4.RELEASE") { + library("R2DBC Postgresql", "1.0.5.RELEASE") { considerSnapshots() group("org.postgresql") { modules = [ From 98a3a62c2cbd2969fba562487bf6b0cadf9afe98 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:37 +0100 Subject: [PATCH 20/22] Upgrade to Reactor Bom 2023.0.5 Closes gh-40209 --- 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 a4f77a6c473..76ce07d79c6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1327,7 +1327,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.5-SNAPSHOT") { + library("Reactor Bom", "2023.0.5") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From d4799fa4b00203cc6c7a3ecd5b4e7e9a46fb80e3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:44 +0100 Subject: [PATCH 21/22] Upgrade to Spring GraphQL 1.2.6 Closes gh-40310 --- 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 76ce07d79c6..fd1f956c099 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1537,7 +1537,7 @@ bom { ] } } - library("Spring GraphQL", "1.2.5") { + library("Spring GraphQL", "1.2.6") { considerSnapshots() group("org.springframework.graphql") { modules = [ From 9c7d8f96ea3d189587f01404d9664a75af1291c6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 18:00:51 +0100 Subject: [PATCH 22/22] Upgrade to Tomcat 10.1.20 Closes gh-40311 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 43c777cf746..87b5a44236a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,6 @@ kotlinVersion=1.9.23 mavenVersion=3.9.4 nativeBuildToolsVersion=0.9.28 springFrameworkVersion=6.1.6-SNAPSHOT -tomcatVersion=10.1.19 +tomcatVersion=10.1.20 kotlin.stdlib.default.dependency=false