From 2dae04a79812a77fb583a56803a05968eab3f1f5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:29 +0100 Subject: [PATCH 01/14] Upgrade to AspectJ 1.9.22 Closes gh-40279 --- 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 967c6b03e8a..1fcdfb66dd9 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 93af29e5ccc9c23b296e82263a5ec395927db083 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:33 +0100 Subject: [PATCH 02/14] Upgrade to Byte Buddy 1.14.13 Closes gh-40280 --- 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 1fcdfb66dd9..850b33ebaa4 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 d6ace6108c0ddac97cf697b65698e49d048acfbb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:38 +0100 Subject: [PATCH 03/14] Upgrade to Groovy 4.0.21 Closes gh-40281 --- 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 850b33ebaa4..48d9e1bd35e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -327,7 +327,7 @@ bom { ] } } - library("Groovy", "4.0.20") { + library("Groovy", "4.0.21") { group("org.apache.groovy") { imports = [ "groovy-bom" From 368b82b23084ae2b0770fce77039eee68aa37233 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:43 +0100 Subject: [PATCH 04/14] Upgrade to Hibernate 6.2.24.Final Closes gh-40282 --- 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 48d9e1bd35e..3f8651a9c7f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -365,7 +365,7 @@ bom { ] } } - library("Hibernate", "6.2.22.Final") { + library("Hibernate", "6.2.24.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 500c449cab356775ae13599e6222b21619d0b43e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:47 +0100 Subject: [PATCH 05/14] Upgrade to Jakarta Json Bind 3.0.1 Closes gh-40283 --- 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 3f8651a9c7f..fb61315976d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -502,7 +502,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 d18f36ee81897ce66e2a06d6f94e2f2171715adf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:52 +0100 Subject: [PATCH 06/14] Upgrade to Jersey 3.1.6 Closes gh-40284 --- 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 fb61315976d..908072783e7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -652,7 +652,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 1f77b7507d121cbc15748df2812a0c273aac3444 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:27:56 +0100 Subject: [PATCH 07/14] Upgrade to jOOQ 3.18.14 Closes gh-40285 --- 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 908072783e7..e4c0df6d3ed 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -680,7 +680,7 @@ bom { ] } } - library("jOOQ", "3.18.13") { + library("jOOQ", "3.18.14") { group("org.jooq") { modules = [ "jooq", From e7c1d180e3556a67f715ceec2d22b82696837d79 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:01 +0100 Subject: [PATCH 08/14] Upgrade to Lombok 1.18.32 Closes gh-40286 --- 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 e4c0df6d3ed..4adecfa98a7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -835,7 +835,7 @@ bom { ] } } - library("Lombok", "1.18.30") { + library("Lombok", "1.18.32") { group("org.projectlombok") { modules = [ "lombok" From 15cbba506a62c082f32474ced8f1fd33b97d2b5d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:02 +0100 Subject: [PATCH 09/14] Upgrade to Micrometer 1.11.11 Closes gh-40196 --- 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 4adecfa98a7..e0638504b39 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -975,7 +975,7 @@ bom { ] } } - library("Micrometer", "1.11.11-SNAPSHOT") { + library("Micrometer", "1.11.11") { considerSnapshots() group("io.micrometer") { modules = [ From b643ff95fc463646ce134896fed9299a51067b7f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:02 +0100 Subject: [PATCH 10/14] Upgrade to Micrometer Tracing 1.1.12 Closes gh-40197 --- 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 e0638504b39..1f63f5cd494 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -988,7 +988,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.12-SNAPSHOT") { + library("Micrometer Tracing", "1.1.12") { considerSnapshots() calendarName = "Tracing" group("io.micrometer") { From e5347e505738aa14f99cbfffde77cfd171d8ba86 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:07 +0100 Subject: [PATCH 11/14] Upgrade to Netty 4.1.108.Final Closes gh-40287 --- 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 1f63f5cd494..deffc8f623d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1061,7 +1061,7 @@ bom { ] } } - library("Netty", "4.1.107.Final") { + library("Netty", "4.1.108.Final") { group("io.netty") { imports = [ "netty-bom" From b13b6b83eb637c6e5fa8199cf7ba96b4f06b850a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:08 +0100 Subject: [PATCH 12/14] Upgrade to Reactor Bom 2022.0.18 Closes gh-40198 --- 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 deffc8f623d..e8401142933 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1217,7 +1217,7 @@ bom { ] } } - library("Reactor Bom", "2022.0.18-SNAPSHOT") { + library("Reactor Bom", "2022.0.18") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From 1fa7ceb6214d6cc44020ee85c0e86008cd41abab Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:12 +0100 Subject: [PATCH 13/14] Upgrade to Spring GraphQL 1.2.6 Closes gh-40288 --- 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 e8401142933..a1fc4baf4ef 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1424,7 +1424,7 @@ bom { ] } } - library("Spring GraphQL", "1.2.5") { + library("Spring GraphQL", "1.2.6") { considerSnapshots() group("org.springframework.graphql") { modules = [ From 3496fe03a5fa345e4138e719079400b6bc778837 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 10:28:17 +0100 Subject: [PATCH 14/14] Upgrade to Tomcat 10.1.20 Closes gh-40289 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a47583dd069..09b11828a3a 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.19-SNAPSHOT -tomcatVersion=10.1.19 +tomcatVersion=10.1.20 kotlin.stdlib.default.dependency=false