From 61d836012964f664e5f95fb6747f27e2b6c5bdf2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:06 +0100 Subject: [PATCH 01/35] Upgrade to ActiveMQ 5.16.6 Closes gh-35507 --- 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 27d8b623638f..9bfda9211b7e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -14,7 +14,7 @@ bom { issueLabels = ["type: dependency-upgrade"] } } - library("ActiveMQ", "5.16.5") { + library("ActiveMQ", "5.16.6") { group("org.apache.activemq") { modules = [ "activemq-amqp", From c1d7d5031dafb0689dfe7f866079659b602d9c19 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:11 +0100 Subject: [PATCH 02/35] Upgrade to Dropwizard Metrics 4.2.18 Closes gh-35508 --- 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 9bfda9211b7e..96f752922e1a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -258,7 +258,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.13") { + library("Dropwizard Metrics", "4.2.18") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From d0c4eb7fb691b4ae24386c07c21fc7763e35c463 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:16 +0100 Subject: [PATCH 03/35] Upgrade to FreeMarker 2.3.32 Closes gh-35509 --- 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 96f752922e1a..5419eae6172d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -329,7 +329,7 @@ bom { ] } } - library("FreeMarker", "2.3.31") { + library("FreeMarker", "2.3.32") { group("org.freemarker") { modules = [ "freemarker" From b034ea28253689b6c1c422220a254a8e52517a53 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:20 +0100 Subject: [PATCH 04/35] Upgrade to Glassfish JAXB 2.3.8 Closes gh-35510 --- 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 5419eae6172d..63b9dce94478 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -356,7 +356,7 @@ bom { ] } } - library("Glassfish JAXB", "2.3.7") { + library("Glassfish JAXB", "2.3.8") { prohibit("[3.0.0-M1,)") { because "it uses the jakarta.* namespace" } From 6ca20b87f77ac4a57ee6fe4bdb33e4dadd6677ae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:26 +0100 Subject: [PATCH 05/35] Upgrade to Groovy 3.0.17 Closes gh-35511 --- 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 63b9dce94478..1f0618227441 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -380,7 +380,7 @@ bom { ] } } - library("Groovy", "3.0.13") { + library("Groovy", "3.0.17") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From 5921106b94d2449666afbe2529abe66f2d2670ec Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:30 +0100 Subject: [PATCH 06/35] Upgrade to Hazelcast 4.2.7 Closes gh-35512 --- 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 1f0618227441..7d8f214b7442 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -410,7 +410,7 @@ bom { ] } } - library("Hazelcast", "4.2.5") { + library("Hazelcast", "4.2.7") { group("com.hazelcast") { modules = [ "hazelcast", From 67677370c2da340dbcd316acaa7450090d7083a2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:35 +0100 Subject: [PATCH 07/35] Upgrade to Hibernate 5.6.15.Final Closes gh-35513 --- 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 7d8f214b7442..443486d27787 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("Hibernate", "5.6.14.Final") { + library("Hibernate", "5.6.15.Final") { prohibit("[6.0.0.Alpha2,)") { because "it uses the jakarta.* namespace" } From 408e6f35b52c20f2ecf06399f97d7171ffd5c281 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:40 +0100 Subject: [PATCH 08/35] Upgrade to HttpClient 4.5.14 Closes gh-35514 --- 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 443486d27787..5ce38849f901 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -498,7 +498,7 @@ bom { ] } } - library("HttpClient", "4.5.13") { + library("HttpClient", "4.5.14") { group("org.apache.httpcomponents") { modules = [ "fluent-hc", From 922409efd183e444fe24d91bbed452acb8f43463 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:45 +0100 Subject: [PATCH 09/35] Upgrade to HttpCore 4.4.16 Closes gh-35515 --- 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 5ce38849f901..273e33bbdbcc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -522,7 +522,7 @@ bom { ] } } - library("HttpCore", "4.4.15") { + library("HttpCore", "4.4.16") { group("org.apache.httpcomponents") { modules = [ "httpcore", From e4a72813114187ec001c80ddd4810016e4e6df4b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:49 +0100 Subject: [PATCH 10/35] Upgrade to Infinispan 12.1.14.Final Closes gh-35516 --- 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 273e33bbdbcc..42d2f5738e38 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -539,7 +539,7 @@ bom { ] } } - library("Infinispan", "12.1.12.Final") { + library("Infinispan", "12.1.14.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 8396e96f60807dae599c72cc85192241fcc32497 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:54 +0100 Subject: [PATCH 11/35] Upgrade to Jackson Bom 2.13.5 Closes gh-35517 --- 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 42d2f5738e38..80e09b03fd70 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -553,7 +553,7 @@ bom { ] } } - library("Jackson Bom", "2.13.4.20221013") { + library("Jackson Bom", "2.13.5") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From 169072afdde66f444715ce24396427e6da671f00 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:23:59 +0100 Subject: [PATCH 12/35] Upgrade to Jaybird 4.0.9.java8 Closes gh-35518 --- 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 80e09b03fd70..4622816d0e05 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -846,7 +846,7 @@ bom { ] } } - library("Jaybird", "4.0.7.java8") { + library("Jaybird", "4.0.9.java8") { group("org.firebirdsql.jdbc") { modules = [ "jaybird", From e6bea54696b5d4dfd1aebc21000651e7cb94cd8d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:03 +0100 Subject: [PATCH 13/35] Upgrade to Jetty Reactive HTTPClient 1.1.14 Closes gh-35519 --- 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 4622816d0e05..9efbaec32def 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -902,7 +902,7 @@ bom { ] } } - library("Jetty Reactive HTTPClient", "1.1.13") { + library("Jetty Reactive HTTPClient", "1.1.14") { prohibit("[2,)") { because "it uses the jakarta.* namespace" } From 176309f14cb45d55238f56b52d2764d7aaf6beb4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:08 +0100 Subject: [PATCH 14/35] Upgrade to Jetty 9.4.51.v20230217 Closes gh-35520 --- 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 9efbaec32def..8f6ebe99283a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -912,7 +912,7 @@ bom { ] } } - library("Jetty", "9.4.49.v20220914") { + library("Jetty", "9.4.51.v20230217") { prohibit("[10.0.0-alpha0,)") { because "it requires Java 11" } From 788c3b6c2554cb44b9aaaab1d5fa73dcada79d69 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:13 +0100 Subject: [PATCH 15/35] Upgrade to Johnzon 1.2.20 Closes gh-35521 --- 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 8f6ebe99283a..a195e6b40107 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -932,7 +932,7 @@ bom { ] } } - library("Johnzon", "1.2.19") { + library("Johnzon", "1.2.20") { group("org.apache.johnzon") { modules = [ "johnzon-core", From dbda252e29934397d4f6b7af5787d588a42a4901 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:18 +0100 Subject: [PATCH 16/35] Upgrade to Jolokia 1.7.2 Closes gh-35522 --- 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 a195e6b40107..cac5ba122c18 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -948,7 +948,7 @@ bom { ] } } - library("Jolokia", "1.7.1") { + library("Jolokia", "1.7.2") { group("org.jolokia") { modules = [ "jolokia-core" From 57082451084be515943212f30bae87a71648c939 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:23 +0100 Subject: [PATCH 17/35] Upgrade to Json-smart 2.4.10 Closes gh-35523 --- 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 cac5ba122c18..4ab26b7f6c86 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -979,7 +979,7 @@ bom { ] } } - library("Json-smart", "2.4.8") { + library("Json-smart", "2.4.10") { group("net.minidev") { modules = [ "json-smart" From 2ba3c874dd9d4ece432a589d64c8efe45175da41 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:28 +0100 Subject: [PATCH 18/35] Upgrade to Logback 1.2.12 Closes gh-35524 --- 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 4ab26b7f6c86..b5f23cddf034 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1104,7 +1104,7 @@ bom { ] } } - library("Logback", "1.2.11") { + library("Logback", "1.2.12") { group("ch.qos.logback") { modules = [ "logback-access", From 462b2a2178aef835f7d1a9bf6768c77d9d749862 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:33 +0100 Subject: [PATCH 19/35] Upgrade to Lombok 1.18.26 Closes gh-35525 --- 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 b5f23cddf034..f5a7461577a0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1113,7 +1113,7 @@ bom { ] } } - library("Lombok", "1.18.24") { + library("Lombok", "1.18.26") { group("org.projectlombok") { modules = [ "lombok" From cb15f35dbf196ce6131ffa45e2e3c9170688eafd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:38 +0100 Subject: [PATCH 20/35] Upgrade to MariaDB 2.7.9 Closes gh-35526 --- 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 f5a7461577a0..dbbb872ec7ba 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1120,7 +1120,7 @@ bom { ] } } - library("MariaDB", "2.7.7") { + library("MariaDB", "2.7.9") { group("org.mariadb.jdbc") { modules = [ "mariadb-java-client" From a58763d0f3721b43e5c0c0657d94ce73530e0af5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:43 +0100 Subject: [PATCH 21/35] Upgrade to Micrometer 1.8.13 Closes gh-35527 --- 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 dbbb872ec7ba..8fb37572c963 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1253,7 +1253,7 @@ bom { ] } } - library("Micrometer", "1.8.12") { + library("Micrometer", "1.8.13") { group("io.micrometer") { modules = [ "micrometer-registry-stackdriver" { From 8d38bae1c3c4f0415e68ec75c70c14b0c380fc19 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:47 +0100 Subject: [PATCH 22/35] Upgrade to MySQL 8.0.33 Closes gh-35528 --- 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 8fb37572c963..5c121c5ebef7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1299,7 +1299,7 @@ bom { ] } } - library("MySQL", "8.0.31") { + library("MySQL", "8.0.33") { group("com.mysql") { modules = [ "mysql-connector-j" { From 63ced46171dd9fa9d7c8e3de64c893ead065da9e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:53 +0100 Subject: [PATCH 23/35] Upgrade to Neo4j Java Driver 4.4.11 Closes gh-35529 --- 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 5c121c5ebef7..e3ee4949d89e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1322,7 +1322,7 @@ bom { ] } } - library("Neo4j Java Driver", "4.4.9") { + library("Neo4j Java Driver", "4.4.11") { group("org.neo4j.driver") { modules = [ "neo4j-java-driver" From 87aed1fafee5a6d8cffb8f8c5c4bc0bc6c408e2f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:24:57 +0100 Subject: [PATCH 24/35] Upgrade to Netty 4.1.92.Final Closes gh-35530 --- 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 e3ee4949d89e..158f8b6da471 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1329,7 +1329,7 @@ bom { ] } } - library("Netty", "4.1.85.Final") { + library("Netty", "4.1.92.Final") { group("io.netty") { imports = [ "netty-bom" From 09ce82b5a6222e732ff9b7ca21c4490e7caec48b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:02 +0100 Subject: [PATCH 25/35] Upgrade to Netty tcNative 2.0.61.Final Closes gh-35531 --- 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 158f8b6da471..37c6dbdb58bf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1336,7 +1336,7 @@ bom { ] } } - library("Netty tcNative", "2.0.54.Final") { + library("Netty tcNative", "2.0.61.Final") { group("io.netty") { modules = [ "netty-tcnative", From d0bbf8433a10f018f5fe309acc35aafe668b44c3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:07 +0100 Subject: [PATCH 26/35] Upgrade to Reactor Bom 2020.0.32 Closes gh-35532 --- 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 37c6dbdb58bf..c4704aec4a45 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1467,7 +1467,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.25") { + library("Reactor Bom", "2020.0.32") { group("io.projectreactor") { imports = [ "reactor-bom" From e5ef0682fba5e6e696a4346f02f0f7421c745e16 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:12 +0100 Subject: [PATCH 27/35] Upgrade to Spring AMQP 2.4.12 Closes gh-35533 --- 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 c4704aec4a45..3a65dca05681 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1690,7 +1690,7 @@ bom { ] } } - library("Spring AMQP", "2.4.8") { + library("Spring AMQP", "2.4.12") { group("org.springframework.amqp") { modules = [ "spring-amqp", From e2cd60b213a0bec4497173e2703033df75e8667e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:17 +0100 Subject: [PATCH 28/35] Upgrade to Spring Batch 4.3.8 Closes gh-35534 --- 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 3a65dca05681..e5c220f7da05 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1701,7 +1701,7 @@ bom { ] } } - library("Spring Batch", "4.3.7") { + library("Spring Batch", "4.3.8") { group("org.springframework.batch") { modules = [ "spring-batch-core", From fa9a5a3a73548c6e463edec72cef18e9f84ea42f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:22 +0100 Subject: [PATCH 29/35] Upgrade to Spring Framework 5.3.27 Closes gh-35535 --- 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 e5c220f7da05..744126630088 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1718,7 +1718,7 @@ bom { ] } } - library("Spring Framework", "5.3.24") { + library("Spring Framework", "5.3.27") { group("org.springframework") { imports = [ "spring-framework-bom" From 83cbe3fc2ca75c00feeb37005a66a228047c4ffc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:27 +0100 Subject: [PATCH 30/35] Upgrade to Spring Integration 5.5.18 Closes gh-35536 --- 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 744126630088..b5c2ff7f3aa6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1732,7 +1732,7 @@ bom { ] } } - library("Spring Integration", "5.5.15") { + library("Spring Integration", "5.5.18") { group("org.springframework.integration") { imports = [ "spring-integration-bom" From 1e5797f3502f9e26bb3b7f76ad48f016fa7816e9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:32 +0100 Subject: [PATCH 31/35] Upgrade to Spring Security 5.6.10 Closes gh-35537 --- 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 b5c2ff7f3aa6..633c10ce5601 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1777,7 +1777,7 @@ bom { ] } } - library("Spring Security", "5.6.9") { + library("Spring Security", "5.6.10") { group("org.springframework.security") { imports = [ "spring-security-bom" From ba7485bf48743beea994c9e70e542fbd8b0d3590 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:37 +0100 Subject: [PATCH 32/35] Upgrade to Spring WS 3.1.6 Closes gh-35538 --- 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 633c10ce5601..638aee896e31 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1791,7 +1791,7 @@ bom { ] } } - library("Spring WS", "3.1.4") { + library("Spring WS", "3.1.6") { group("org.springframework.ws") { modules = [ "spring-ws-core", From 2e8ec62cd43a95d66672cf9ff793ad781536ddff Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:42 +0100 Subject: [PATCH 33/35] Upgrade to Thymeleaf Extras SpringSecurity 3.0.5.RELEASE Closes gh-35539 --- 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 638aee896e31..321bbd3506c0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1841,7 +1841,7 @@ bom { ] } } - library("Thymeleaf Extras SpringSecurity", "3.0.4.RELEASE") { + library("Thymeleaf Extras SpringSecurity", "3.0.5.RELEASE") { group("org.thymeleaf.extras") { modules = [ "thymeleaf-extras-springsecurity5" From 47f1fc57d9a34cb3da6ddc0157fba13c379a075f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:47 +0100 Subject: [PATCH 34/35] Upgrade to Tomcat 9.0.75 Closes gh-35540 --- gradle.properties | 2 +- .../boot/autoconfigure/web/ServerProperties.java | 9 +++++++-- .../embedded/TomcatWebServerFactoryCustomizer.java | 1 + .../TomcatWebServerFactoryCustomizerTests.java | 8 +++++++- .../boot/web/embedded/tomcat/TldPatterns.java | 13 ++++++++++--- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 94bb7995376e..52cf15dbd612 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.21 -tomcatVersion=9.0.69 +tomcatVersion=9.0.75 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index e47c6adba615..41e633d12cf2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -959,8 +959,13 @@ public static class Remoteip { + "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16 + "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16 + "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8 + + "100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 - + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // + + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + + "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "0:0:0:0:0:0:0:1|::1"; /** diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java index deb41dff1476..db5b3ac13187 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java @@ -201,6 +201,7 @@ private void customizeRelaxedQueryChars(ConfigurableTomcatWebServerFactory facto factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars)); } + @SuppressWarnings("deprecation") private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) { factory.addConnectorCustomizers((connector) -> { ProtocolHandler handler = connector.getProtocolHandler(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java index a12d66738b07..cacd7a841478 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java @@ -331,8 +331,13 @@ private void testRemoteIpValveConfigured() { + "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16 + "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16 + "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8 + + "100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + + "100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10 + "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 - + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // + + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + + "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "0:0:0:0:0:0:0:1|::1"; assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies); } @@ -351,6 +356,7 @@ void disableRemoteIpValve() { } @Test + @SuppressWarnings("deprecation") void testCustomizeRejectIllegalHeader() { bind("server.tomcat.reject-illegal-header=false"); customizeAndRunServer((server) -> assertThat( diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java index fd1b8f4f60cf..8b61d67dfcc7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,12 @@ final class TldPatterns { Set skipPatterns = new LinkedHashSet<>(); skipPatterns.add("annotations-api.jar"); skipPatterns.add("ant-junit*.jar"); - skipPatterns.add("ant-launcher.jar"); - skipPatterns.add("ant.jar"); + skipPatterns.add("ant-launcher*.jar"); + skipPatterns.add("ant*.jar"); skipPatterns.add("asm-*.jar"); skipPatterns.add("aspectj*.jar"); + skipPatterns.add("bcel*.jar"); + skipPatterns.add("biz.aQute.bnd*.jar"); skipPatterns.add("bootstrap.jar"); skipPatterns.add("catalina-ant.jar"); skipPatterns.add("catalina-ha.jar"); @@ -51,6 +53,7 @@ final class TldPatterns { skipPatterns.add("commons-beanutils*.jar"); skipPatterns.add("commons-codec*.jar"); skipPatterns.add("commons-collections*.jar"); + skipPatterns.add("commons-compress*.jar"); skipPatterns.add("commons-daemon.jar"); skipPatterns.add("commons-dbcp*.jar"); skipPatterns.add("commons-digester*.jar"); @@ -92,6 +95,8 @@ final class TldPatterns { skipPatterns.add("mail*.jar"); skipPatterns.add("objenesis-*.jar"); skipPatterns.add("oraclepki.jar"); + skipPatterns.add("org.hamcrest.core_*.jar"); + skipPatterns.add("org.junit_*.jar"); skipPatterns.add("oro-*.jar"); skipPatterns.add("servlet-api-*.jar"); skipPatterns.add("servlet-api.jar"); @@ -110,6 +115,7 @@ final class TldPatterns { skipPatterns.add("tomcat-util.jar"); skipPatterns.add("tomcat-websocket.jar"); skipPatterns.add("tools.jar"); + skipPatterns.add("unboundid-ldapsdk-*.jar"); skipPatterns.add("websocket-api.jar"); skipPatterns.add("wsdl4j*.jar"); skipPatterns.add("xercesImpl.jar"); @@ -117,6 +123,7 @@ final class TldPatterns { skipPatterns.add("xmlParserAPIs-*.jar"); skipPatterns.add("xmlParserAPIs.jar"); skipPatterns.add("xom-*.jar"); + TOMCAT_SKIP = Collections.unmodifiableSet(skipPatterns); } From 7f9fd042fb38a390d9835bae119c8764d2066c18 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 21:25:52 +0100 Subject: [PATCH 35/35] Upgrade to Undertow 2.2.24.Final Closes gh-35541 --- .../web/embedded/UndertowWebServerFactoryCustomizer.java | 3 ++- .../web/embedded/UndertowWebServerFactoryCustomizerTests.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java index 8f291b1a220c..f8bca9b75468 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,6 +85,7 @@ public void customize(ConfigurableUndertowWebServerFactory factory) { map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders); } + @SuppressWarnings("deprecation") private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Undertow properties = this.serverProperties.getUndertow(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java index 7b544fb3e6ba..1e070451e42c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java @@ -150,6 +150,7 @@ void customizeWorkerThreads() { } @Test + @SuppressWarnings("deprecation") void allowEncodedSlashes() { bind("server.undertow.allow-encoded-slash=true"); assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 321bbd3506c0..71066ce8b4c7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1882,7 +1882,7 @@ bom { ] } } - library("Undertow", "2.2.20.Final") { + library("Undertow", "2.2.24.Final") { group("io.undertow") { modules = [ "undertow-core",