From 7319d55b23d7af616d6d83ce042008654d2e4c05 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:21 +0000 Subject: [PATCH 01/16] Upgrade to AspectJ 1.9.21 Closes gh-38779 --- 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 446556b29a..4fec9a0a7c 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.20.1") { + library("AspectJ", "1.9.21") { group("org.aspectj") { modules = [ "aspectjrt", From 3b9a05713d3cba2a8e57c80c4cf05827e6d4ae7d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:26 +0000 Subject: [PATCH 02/16] Upgrade to Dropwizard Metrics 4.2.23 Closes gh-38780 --- 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 4fec9a0a7c..ea0b371a12 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -240,7 +240,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.22") { + library("Dropwizard Metrics", "4.2.23") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 75643866d89547330fd9369952323c6b23c42308 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:31 +0000 Subject: [PATCH 03/16] Upgrade to Groovy 4.0.16 Closes gh-38781 --- 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 ea0b371a12..a0aa5b630b 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.15") { + library("Groovy", "4.0.16") { group("org.apache.groovy") { imports = [ "groovy-bom" From 6bd8c295e0c581f625cd90316ba3edfe5e7563b3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:35 +0000 Subject: [PATCH 04/16] Upgrade to Hibernate 6.2.15.Final Closes gh-38782 --- 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 a0aa5b630b..3baae927e6 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.13.Final") { + library("Hibernate", "6.2.15.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 0622f6f80ec341da51e6be02a5974668ac17e4ac Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:40 +0000 Subject: [PATCH 05/16] Upgrade to HttpClient5 5.2.3 Closes gh-38783 --- 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 3baae927e6..4e61ceaded 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -426,7 +426,7 @@ bom { ] } } - library("HttpClient5", "5.2.1") { + library("HttpClient5", "5.2.3") { group("org.apache.httpcomponents.client5") { modules = [ "httpclient5", From ec81c6650ce904359906d801b74e1f01501d3693 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:45 +0000 Subject: [PATCH 06/16] Upgrade to HttpCore5 5.2.4 Closes gh-38784 --- 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 4e61ceaded..4dd785bb66 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -444,7 +444,7 @@ bom { ] } } - library("HttpCore5", "5.2.3") { + library("HttpCore5", "5.2.4") { group("org.apache.httpcomponents.core5") { modules = [ "httpcore5", From 16cca99d1fc5ecd25302eb8cd0545cb1c21976a1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:50 +0000 Subject: [PATCH 07/16] Upgrade to Janino 3.1.11 Closes gh-38785 --- 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 4dd785bb66..8223d6ebff 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -594,7 +594,7 @@ bom { ] } } - library("Janino", "3.1.10") { + library("Janino", "3.1.11") { group("org.codehaus.janino") { modules = [ "commons-compiler", From 7129b61856af8e0f1b63a17a798964243bcc08ae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:54 +0000 Subject: [PATCH 08/16] Upgrade to Jaybird 5.0.3.java11 Closes gh-38786 --- 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 8223d6ebff..7b73c04bcd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -624,7 +624,7 @@ bom { ] } } - library("Jaybird", "5.0.2.java11") { + library("Jaybird", "5.0.3.java11") { group("org.firebirdsql.jdbc") { modules = [ "jaybird" From 5199977e03fe0cfad148618ad9b84c2acafbd060 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:10:59 +0000 Subject: [PATCH 09/16] Upgrade to Jersey 3.1.5 Closes gh-38787 --- 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 7b73c04bcd..ad9ccc0fc7 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.3") { + library("Jersey", "3.1.5") { group("org.glassfish.jersey") { imports = [ "jersey-bom" From bef2dabc271ef5b328ff894c84fcaf87df9bda45 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:04 +0000 Subject: [PATCH 10/16] Upgrade to Logback 1.4.14 Closes gh-38788 --- 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 ad9ccc0fc7..e2c6078890 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -826,7 +826,7 @@ bom { ] } } - library("Logback", "1.4.11") { + library("Logback", "1.4.14") { group("ch.qos.logback") { modules = [ "logback-access", From b30bec1156d4e79b2dc9ab1454c823ca73126024 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:14 +0000 Subject: [PATCH 11/16] Upgrade to R2DBC Postgresql 1.0.3.RELEASE Closes gh-38790 --- 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 e2c6078890..6632fd37e0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1172,7 +1172,7 @@ bom { ] } } - library("R2DBC Postgresql", "1.0.2.RELEASE") { + library("R2DBC Postgresql", "1.0.3.RELEASE") { considerSnapshots() group("org.postgresql") { modules = [ From cf9538cbccf67473c3e520d8dbbd9bb1bce555b5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:19 +0000 Subject: [PATCH 12/16] Upgrade to R2DBC Proxy 1.1.3.RELEASE Closes gh-38791 --- 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 6632fd37e0..0e4be3e7b4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1180,7 +1180,7 @@ bom { ] } } - library("R2DBC Proxy", "1.1.2.RELEASE") { + library("R2DBC Proxy", "1.1.3.RELEASE") { considerSnapshots() group("io.r2dbc") { modules = [ From 9c9a82163f7bfee73a6b79da6d02843a53b1ca9a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:19 +0000 Subject: [PATCH 13/16] Upgrade to Spring Framework 6.0.15 Closes gh-38680 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 08b7c4931b..6e279aae10 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.15-SNAPSHOT +springFrameworkVersion=6.0.15 tomcatVersion=10.1.16 kotlin.stdlib.default.dependency=false From 1bd4ce9cb8cb31a922d0a26c5403e897b93c59b9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:25 +0000 Subject: [PATCH 14/16] Upgrade to Tomcat 10.1.17 Closes gh-38792 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6e279aae10..a57b91a070 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.15 -tomcatVersion=10.1.16 +tomcatVersion=10.1.17 kotlin.stdlib.default.dependency=false From aa1de9cee2e91fdd57826175999e5adb23c0bfa3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:11:29 +0000 Subject: [PATCH 15/16] Upgrade to UnboundID LDAPSDK 6.0.11 Closes gh-38793 --- 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 0e4be3e7b4..55e0cb0aea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1573,7 +1573,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.10") { + library("UnboundID LDAPSDK", "6.0.11") { group("com.unboundid") { modules = [ "unboundid-ldapsdk" From 1d64976876aaeb7ffa81642e660866624713891d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 14 Dec 2023 14:50:58 +0000 Subject: [PATCH 16/16] Upgrade to Netty 4.1.102.Final Closes gh-38795 --- 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 55e0cb0aea..9eb0731adc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1057,7 +1057,7 @@ bom { ] } } - library("Netty", "4.1.101.Final") { + library("Netty", "4.1.102.Final") { prohibit { versionRange "[4.1.103.Final]" because "it crashes on macOS (https://github.com/netty/netty/issues/13728)"