From 6bbc416616ab0758db7ad174f4b861c0126af0b8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:19 +0100 Subject: [PATCH 01/44] Upgrade to ActiveMQ 5.16.6 Closes gh-35461 --- 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 6913f288dd..c5e5dc6fab 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 6e131fb904e6db31bdc6b01bf7e390768b99a5f1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:21 +0100 Subject: [PATCH 02/44] Upgrade to AppEngine SDK 1.9.98 Closes gh-35462 --- 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 c5e5dc6fab..c57711603c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -63,7 +63,7 @@ bom { ] } } - library("AppEngine SDK", "1.9.96") { + library("AppEngine SDK", "1.9.98") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From eaf6831e92ae3ac34937dc33e57ee47779ee80f4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:24 +0100 Subject: [PATCH 03/44] Upgrade to Dependency Management Plugin 1.0.15.RELEASE Closes gh-35463 --- 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 c57711603c..6a867c0d9c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -233,7 +233,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.0.11.RELEASE") { + library("Dependency Management Plugin", "1.0.15.RELEASE") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From ed7badc2d1456d188ab1e585851c7878edc96ba1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:27 +0100 Subject: [PATCH 04/44] Upgrade to Dropwizard Metrics 4.1.36 Closes gh-35464 --- 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 6a867c0d9c..4cd62a3f26 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -251,7 +251,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.1.31") { + library("Dropwizard Metrics", "4.1.36") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From acad5b93d8b28d1596c9c7e6208e909c049bf353 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:30 +0100 Subject: [PATCH 05/44] Upgrade to Ehcache3 3.9.11 Closes gh-35465 --- 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 4cd62a3f26..64db705bc8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -265,7 +265,7 @@ bom { ] } } - library("Ehcache3", "3.9.9") { + library("Ehcache3", "3.9.10") { group("org.ehcache") { modules = [ "ehcache", From 6fb6fc2beca90f0dda19fa3ef8c1ed3d662664cd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:32 +0100 Subject: [PATCH 06/44] Upgrade to FreeMarker 2.3.32 Closes gh-35466 --- 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 64db705bc8..dd75659112 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -322,7 +322,7 @@ bom { ] } } - library("FreeMarker", "2.3.31") { + library("FreeMarker", "2.3.32") { group("org.freemarker") { modules = [ "freemarker" From 18c27f9a2ea70ef048bbf34ae0985c24390e994d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:35 +0100 Subject: [PATCH 07/44] Upgrade to Glassfish JAXB 2.3.8 Closes gh-35467 --- 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 dd75659112..48647b023a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -346,7 +346,7 @@ bom { ] } } - library("Glassfish JAXB", "2.3.6") { + library("Glassfish JAXB", "2.3.8") { prohibit("[3.0.0-M1,)") { because "it uses the jakarta.* namespace" } From ee8c635083112625a5065e3c3743ff086903766c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:38 +0100 Subject: [PATCH 08/44] Upgrade to Groovy 3.0.17 Closes gh-35468 --- .../ResolveDependencyCoordinatesTransformationTests.java | 8 +++++--- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java index cbea73ba22..99e918574e 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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. @@ -37,6 +37,8 @@ import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.io.ReaderSource; +import org.codehaus.groovy.syntax.Token; +import org.codehaus.groovy.syntax.Types; import org.codehaus.groovy.transform.ASTTransformation; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -195,8 +197,8 @@ final class ResolveDependencyCoordinatesTransformationTests { ClassNode classNode = new ClassNode("Test", 0, new ClassNode(Object.class)); this.moduleNode.addClass(classNode); - DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"), null, - new ConstantExpression("test")); + DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"), + new Token(Types.ASSIGN, "=", 1, 1), new ConstantExpression("test")); declarationExpression.addAnnotation(this.grabAnnotation); BlockStatement code = new BlockStatement(Arrays.asList(new ExpressionStatement(declarationExpression)), diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 48647b023a..1f433c3122 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -370,7 +370,7 @@ bom { ] } } - library("Groovy", "3.0.10") { + library("Groovy", "3.0.17") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From 8f9fc7e38de7bf9bda5a4d4901e50f8768a3a8dc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:41 +0100 Subject: [PATCH 09/44] Upgrade to Hazelcast 4.1.10 Closes gh-35469 --- 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 1f433c3122..3bd07c2215 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -400,7 +400,7 @@ bom { ] } } - library("Hazelcast", "4.1.9") { + library("Hazelcast", "4.1.10") { group("com.hazelcast") { modules = [ "hazelcast", From 325ff6e518c380b04e2370f5841197f1c22dd04b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:44 +0100 Subject: [PATCH 10/44] Upgrade to Hibernate Validator 6.2.5.Final Closes gh-35470 --- 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 3bd07c2215..0557446a0e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -439,7 +439,7 @@ bom { ] } } - library("Hibernate Validator", "6.2.3.Final") { + library("Hibernate Validator", "6.2.5.Final") { prohibit("[7.0.0.Alpha1,)") { because "it uses the jakarta.* namespace" } From 01647600ff302f5e3016ee625eef9fe222de45a8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:48 +0100 Subject: [PATCH 11/44] Upgrade to HttpClient 4.5.14 Closes gh-35471 --- 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 0557446a0e..2b11486943 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -485,7 +485,7 @@ bom { ] } } - library("HttpClient", "4.5.13") { + library("HttpClient", "4.5.14") { group("org.apache.httpcomponents") { modules = [ "fluent-hc", From d0017f18affb3e3c5a6f3c76a716fdfc7dcfa93c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:50 +0100 Subject: [PATCH 12/44] Upgrade to HttpCore 4.4.16 Closes gh-35472 --- 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 2b11486943..99fe9568d7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -509,7 +509,7 @@ bom { ] } } - library("HttpCore", "4.4.15") { + library("HttpCore", "4.4.16") { group("org.apache.httpcomponents") { modules = [ "httpcore", From 1b0a6a286fb869b8a46982bdb5bc7b7f4d9e0e11 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:53 +0100 Subject: [PATCH 13/44] Upgrade to HttpCore5 5.1.5 Closes gh-35473 --- 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 99fe9568d7..4f867e36bb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -517,7 +517,7 @@ bom { ] } } - library("HttpCore5", "5.1.3") { + library("HttpCore5", "5.1.5") { group("org.apache.httpcomponents.core5") { modules = [ "httpcore5", From e278990ebda0cf98c52f1817bf657b51207d5978 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:56 +0100 Subject: [PATCH 14/44] Upgrade to Infinispan 12.1.14.Final Closes gh-35474 --- 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 4f867e36bb..411620cb4d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -526,7 +526,7 @@ bom { ] } } - library("Infinispan", "12.1.11.Final") { + library("Infinispan", "12.1.14.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 9e169b5c3dbb8ab410b5d4b4ba453d47dcb1fc75 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:26:59 +0100 Subject: [PATCH 15/44] Upgrade to Jackson Bom 2.12.7.20221012 Closes gh-35475 --- 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 411620cb4d..2da5b863ba 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -540,7 +540,7 @@ bom { ] } } - library("Jackson Bom", "2.12.6.20220326") { + library("Jackson Bom", "2.12.7.20221012") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From 4f7abfdec2f0e590bc02a76c6232f6d2f8925265 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:27:01 +0100 Subject: [PATCH 16/44] Upgrade to Janino 3.1.9 Closes gh-35476 --- 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 2da5b863ba..e17d8a1d7b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -719,7 +719,7 @@ bom { ] } } - library("Janino", "3.1.7") { + library("Janino", "3.1.9") { group("org.codehaus.janino") { modules = [ "commons-compiler", From 82805bbd8d59c8312a852ab7bb85b825757b36c7 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:27:04 +0100 Subject: [PATCH 17/44] Upgrade to Jaybird 4.0.9.java8 Closes gh-35477 --- 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 e17d8a1d7b..f7ad12cf5e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -833,7 +833,7 @@ bom { ] } } - library("Jaybird", "4.0.6.java8") { + library("Jaybird", "4.0.9.java8") { group("org.firebirdsql.jdbc") { modules = [ "jaybird", From f10685b73ab394f64c507ec498c6e79be3a5833d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:27:07 +0100 Subject: [PATCH 18/44] Upgrade to Jetty Reactive HTTPClient 1.1.14 Closes gh-35478 --- 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 f7ad12cf5e..fb4dd1b74c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -893,7 +893,7 @@ bom { ] } } - library("Jetty Reactive HTTPClient", "1.1.11") { + library("Jetty Reactive HTTPClient", "1.1.14") { prohibit("[2,)") { because "it uses the jakarta.* namespace" } From 1723ed338592b770fb4bc1b3d86013825d672ecc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:27:09 +0100 Subject: [PATCH 19/44] Upgrade to Jetty 9.4.51.v20230217 Closes gh-35479 --- 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 fb4dd1b74c..22f6771d03 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -903,7 +903,7 @@ bom { ] } } - library("Jetty", "9.4.46.v20220331") { + library("Jetty", "9.4.51.v20230217") { prohibit("[11.0.0-alpha0,)") { because "it uses the jakarta.* namespace" } From 8fafd886ccde3ff156fbdfd2cd10650de3993348 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:27:12 +0100 Subject: [PATCH 20/44] Upgrade to Johnzon 1.2.20 Closes gh-35480 --- 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 22f6771d03..e759174481 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -920,7 +920,7 @@ bom { ] } } - library("Johnzon", "1.2.18") { + library("Johnzon", "1.2.20") { group("org.apache.johnzon") { modules = [ "johnzon-core", From fe114892e433abd2b4ac9e287aecc1fcd2b2eec4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:08 +0100 Subject: [PATCH 21/44] Upgrade to jOOQ 3.14.16 Closes gh-35481 --- 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 e759174481..bf1cf6225a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -943,7 +943,7 @@ bom { ] } } - library("jOOQ", "3.14.15") { + library("jOOQ", "3.14.16") { group("org.jooq") { modules = [ "jooq", From 3721328120a4f54c6517b2df74d2f733c8a24568 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:12 +0100 Subject: [PATCH 22/44] Upgrade to Json-smart 2.4.10 Closes gh-35482 --- 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 bf1cf6225a..580fd75b1a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -964,7 +964,7 @@ bom { ] } } - library("Json-smart", "2.4.8") { + library("Json-smart", "2.4.10") { group("net.minidev") { modules = [ "json-smart" From db8100209d71055e41cf9256c42d6aa25480e698 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:17 +0100 Subject: [PATCH 23/44] Upgrade to JsonAssert 1.5.1 Closes gh-35483 --- 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 580fd75b1a..3f0d3b31b7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -971,7 +971,7 @@ bom { ] } } - library("JsonAssert", "1.5.0") { + library("JsonAssert", "1.5.1") { group("org.skyscreamer") { modules = [ "jsonassert" From 924ee4e0004c906a3c64eb079689573ba0d2fc4b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:22 +0100 Subject: [PATCH 24/44] Upgrade to Lettuce 6.1.10.RELEASE Closes gh-35484 --- 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 3f0d3b31b7..d115333a93 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1058,7 +1058,7 @@ bom { ] } } - library("Lettuce", "6.1.8.RELEASE") { + library("Lettuce", "6.1.10.RELEASE") { group("io.lettuce") { modules = [ "lettuce-core" From 31dee5dc23a23307d3276090dafbb151edf4d753 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:27 +0100 Subject: [PATCH 25/44] Upgrade to Logback 1.2.12 Closes gh-35485 --- 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 d115333a93..65d1bc3fb5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1083,7 +1083,7 @@ bom { ] } } - library("Logback", "1.2.11") { + library("Logback", "1.2.12") { group("ch.qos.logback") { modules = [ "logback-access", From 310d8a919b2cc569901c41e84764abcd18397aae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:31 +0100 Subject: [PATCH 26/44] Upgrade to Lombok 1.18.26 Closes gh-35486 --- 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 65d1bc3fb5..c7431fbf65 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1092,7 +1092,7 @@ bom { ] } } - library("Lombok", "1.18.24") { + library("Lombok", "1.18.26") { group("org.projectlombok") { modules = [ "lombok" From 22ed3744b22c2743dbb90990fe8a0cd490a278a5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:36 +0100 Subject: [PATCH 27/44] Upgrade to MariaDB 2.7.9 Closes gh-35487 --- 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 c7431fbf65..e28461845d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1099,7 +1099,7 @@ bom { ] } } - library("MariaDB", "2.7.5") { + library("MariaDB", "2.7.9") { group("org.mariadb.jdbc") { modules = [ "mariadb-java-client" From c680e430b02966bbdf0a3707c57c0c112d239e5b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:41 +0100 Subject: [PATCH 28/44] Upgrade to MySQL 8.0.33 Closes gh-35488 --- 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 e28461845d..6efe062f6e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1278,7 +1278,7 @@ bom { ] } } - library("MySQL", "8.0.29") { + library("MySQL", "8.0.33") { group("mysql") { modules = [ "mysql-connector-java" { From 5094681e3f9c2e6a048c5ee2b0abff7e9fc88b1c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:46 +0100 Subject: [PATCH 29/44] Upgrade to Netty 4.1.92.Final Closes gh-35489 --- 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 6efe062f6e..fda026b6d3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1301,7 +1301,7 @@ bom { ] } } - library("Netty", "4.1.77.Final") { + library("Netty", "4.1.92.Final") { group("io.netty") { imports = [ "netty-bom" From d898520c4c3d0d73ee8d9506e0d520d268795fd8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:50 +0100 Subject: [PATCH 30/44] Upgrade to Netty tcNative 2.0.61.Final Closes gh-35490 --- 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 fda026b6d3..841bb837ee 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1308,7 +1308,7 @@ bom { ] } } - library("Netty tcNative", "2.0.52.Final") { + library("Netty tcNative", "2.0.61.Final") { group("io.netty") { modules = [ "netty-tcnative", From 0e13c1664d99116cccfbf135944549d21431373c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:42:55 +0100 Subject: [PATCH 31/44] Upgrade to Postgresql 42.2.27 Closes gh-35491 --- 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 841bb837ee..fcd5b9230a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1417,7 +1417,7 @@ bom { ] } } - library("Postgresql", "42.2.25") { + library("Postgresql", "42.2.27") { group("org.postgresql") { modules = [ "postgresql" From e48a29298850dea25097ca6348a5c171f111115c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:00 +0100 Subject: [PATCH 32/44] Upgrade to Reactive Streams 1.0.4 Closes gh-35492 --- 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 fcd5b9230a..110503c6e7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1469,7 +1469,7 @@ bom { ] } } - library("Reactive Streams", "1.0.3") { + library("Reactive Streams", "1.0.4") { group("org.reactivestreams") { modules = [ "reactive-streams" From dd32fd4a4943a0baec4defdb4c4d3b6a0e45e10d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:04 +0100 Subject: [PATCH 33/44] Upgrade to Reactor Bom 2020.0.32 Closes gh-35493 --- 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 110503c6e7..c3607820cd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1476,7 +1476,7 @@ bom { ] } } - library("Reactor Bom", "2020.0.19") { + library("Reactor Bom", "2020.0.32") { group("io.projectreactor") { imports = [ "reactor-bom" From 2598417d3dd6fb9570fa36f153fe840f7fd262b5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:09 +0100 Subject: [PATCH 34/44] Upgrade to RSocket 1.1.3 Closes gh-35494 --- 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 c3607820cd..5824d5bcd3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1496,7 +1496,7 @@ bom { ] } } - library("RSocket", "1.1.2") { + library("RSocket", "1.1.3") { group("io.rsocket") { imports = [ "rsocket-bom" From c575aac67d47b2c4abac38b778a4c1d58a820aa3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:13 +0100 Subject: [PATCH 35/44] Upgrade to Spring Batch 4.3.8 Closes gh-35495 --- 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 5824d5bcd3..862e65d248 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1699,7 +1699,7 @@ bom { ] } } - library("Spring Batch", "4.3.6") { + library("Spring Batch", "4.3.8") { group("org.springframework.batch") { modules = [ "spring-batch-core", From b00b2ea2c596eb091d475c51d1607d0167f37df2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:18 +0100 Subject: [PATCH 36/44] Upgrade to Spring Data Bom 2021.0.12 Closes gh-35496 --- 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 862e65d248..ef1e90c7ac 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1709,7 +1709,7 @@ bom { ] } } - library("Spring Data Bom", "2021.0.11") { + library("Spring Data Bom", "2021.0.12") { group("org.springframework.data") { imports = [ "spring-data-bom" From cf1dc6dae18af3989e99f8a506423270f9320345 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:23 +0100 Subject: [PATCH 37/44] Upgrade to Spring Framework 5.3.27 Closes gh-35497 --- .../jdbc/HikariDriverConfigurationFailureAnalyzer.java | 8 ++++---- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java index 30d4d4aa58..9e04c28871 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 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. @@ -28,12 +28,12 @@ import org.springframework.jdbc.CannotGetJdbcConnectionException; */ class HikariDriverConfigurationFailureAnalyzer extends AbstractFailureAnalyzer { - private static final String EXPECTED_MESSAGE = "Failed to obtain JDBC Connection:" - + " cannot use driverClassName and dataSourceClassName together."; + private static final String EXPECTED_MESSAGE = "cannot use driverClassName and dataSourceClassName together."; @Override protected FailureAnalysis analyze(Throwable rootFailure, CannotGetJdbcConnectionException cause) { - if (!EXPECTED_MESSAGE.equals(cause.getMessage())) { + Throwable subCause = cause.getCause(); + if (subCause == null || !EXPECTED_MESSAGE.equals(subCause.getMessage())) { return null; } return new FailureAnalysis( diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ef1e90c7ac..c3dd406c49 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1716,7 +1716,7 @@ bom { ] } } - library("Spring Framework", "5.3.20") { + library("Spring Framework", "5.3.27") { group("org.springframework") { imports = [ "spring-framework-bom" From 9972c4030bea6954cb41c695de52b89bf37272d8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:28 +0100 Subject: [PATCH 38/44] Upgrade to Spring Integration 5.5.18 Closes gh-35498 --- 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 c3dd406c49..6cea51c9f3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1730,7 +1730,7 @@ bom { ] } } - library("Spring Integration", "5.5.12") { + library("Spring Integration", "5.5.18") { group("org.springframework.integration") { imports = [ "spring-integration-bom" From 917bb230cedc32f8a11f046ab562aaa116220a35 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:32 +0100 Subject: [PATCH 39/44] Upgrade to Spring RESTDocs 2.0.7.RELEASE Closes gh-35499 --- 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 6cea51c9f3..24ca0657a0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1757,7 +1757,7 @@ bom { ] } } - library("Spring RESTDocs", "2.0.6.RELEASE") { + library("Spring RESTDocs", "2.0.7.RELEASE") { group("org.springframework.restdocs") { modules = [ "spring-restdocs-asciidoctor", From 1f490c7f79ad98e883f22cc4dfecb0f1952057db Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:37 +0100 Subject: [PATCH 40/44] Upgrade to Spring Retry 1.3.4 Closes gh-35500 --- 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 24ca0657a0..47882ae7b6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1768,7 +1768,7 @@ bom { ] } } - library("Spring Retry", "1.3.3") { + library("Spring Retry", "1.3.4") { group("org.springframework.retry") { modules = [ "spring-retry" From d73a6cc3feef8c2d1e4e74cea612d33e00ff23d4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:41 +0100 Subject: [PATCH 41/44] Upgrade to Spring WS 3.1.6 Closes gh-35501 --- 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 47882ae7b6..4fada84ad0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1794,7 +1794,7 @@ bom { ] } } - library("Spring WS", "3.1.3") { + library("Spring WS", "3.1.6") { group("org.springframework.ws") { modules = [ "spring-ws-core", From 6967a641ab17dddd31f89e8187029ec5a073ba0b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:46 +0100 Subject: [PATCH 42/44] Upgrade to Thymeleaf Extras SpringSecurity 3.0.5.RELEASE Closes gh-35502 --- 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 4fada84ad0..57b27038e1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1844,7 +1844,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 93d571b0169840353e28ea8f543d43f29606f00a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:51 +0100 Subject: [PATCH 43/44] Upgrade to Tomcat 9.0.75 Closes gh-35503 --- gradle.properties | 2 +- .../boot/autoconfigure/web/ServerProperties.java | 9 +++++++-- .../TomcatWebServerFactoryCustomizerTests.java | 7 ++++++- .../boot/web/embedded/tomcat/TldPatterns.java | 13 ++++++++++--- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index de8119e445..6bb265d9b8 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.5.32 -tomcatVersion=9.0.63 +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 1b5456129d..f39618dbc1 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-2021 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. @@ -900,8 +900,13 @@ public class ServerProperties { + "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/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 5e3015b811..b99c79b21b 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 @@ -318,8 +318,13 @@ class TomcatWebServerFactoryCustomizerTests { + "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); } 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 fd1b8f4f60..8b61d67dfc 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 e1663e209756dad33dfe61faae66178e5a7fe6da Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 May 2023 18:43:56 +0100 Subject: [PATCH 44/44] Upgrade to Undertow 2.2.24.Final Closes gh-35504 --- .../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 8f291b1a22..f8bca9b754 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 class UndertowWebServerFactoryCustomizer 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 7b544fb3e6..1e070451e4 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 @@ class UndertowWebServerFactoryCustomizerTests { } @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 57b27038e1..cf00882746 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1885,7 +1885,7 @@ bom { ] } } - library("Undertow", "2.2.17.Final") { + library("Undertow", "2.2.24.Final") { group("io.undertow") { modules = [ "undertow-core",