From e1d3743da6d13e3b7d3aa75e29d8c05584f24343 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:08 +0000 Subject: [PATCH 01/17] Upgrade to Caffeine 3.1.5 Closes gh-34662 --- 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 bae4055236..be30507490 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -107,7 +107,7 @@ bom { ] } } - library("Caffeine", "3.1.4") { + library("Caffeine", "3.1.5") { group("com.github.ben-manes.caffeine") { modules = [ "caffeine", From dcef19b6a6a46d69ee9940d61324fa0a7bf3ac38 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:15 +0000 Subject: [PATCH 02/17] Upgrade to Couchbase Client 3.4.4 Closes gh-34663 --- 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 be30507490..6de52a9045 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -173,7 +173,7 @@ bom { ] } } - library("Couchbase Client", "3.4.3") { + library("Couchbase Client", "3.4.4") { group("com.couchbase.client") { modules = [ "java-client" From d6c38b30d758c9cde025a8c32bbac54fa460824a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:21 +0000 Subject: [PATCH 03/17] Upgrade to Dropwizard Metrics 4.2.18 Closes gh-34664 --- 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 6de52a9045..21fbca1370 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -206,7 +206,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.17") { + library("Dropwizard Metrics", "4.2.18") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 876d45b91a91bd8511ad4688aa04faa86ffee993 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:26 +0000 Subject: [PATCH 04/17] Upgrade to Groovy 4.0.10 Closes gh-34665 --- 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 21fbca1370..4b5a598bf0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -291,7 +291,7 @@ bom { ] } } - library("Groovy", "4.0.9") { + library("Groovy", "4.0.10") { group("org.apache.groovy") { imports = [ "groovy-bom" From 22b350583a2c4ce626a2c57a557360a8fb460e18 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:31 +0000 Subject: [PATCH 05/17] Upgrade to Infinispan 14.0.7.Final Closes gh-34666 --- 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 4b5a598bf0..317fb34ae0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -431,7 +431,7 @@ bom { ] } } - library("Infinispan", "14.0.6.Final") { + library("Infinispan", "14.0.7.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 7c5291185e11f04fc9eb575cc75c2b5dc62bab73 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:36 +0000 Subject: [PATCH 06/17] Upgrade to Jetty Reactive HTTPClient 3.0.8 Closes gh-34667 --- 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 317fb34ae0..a352e72f0e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -637,7 +637,7 @@ bom { ] } } - library("Jetty Reactive HTTPClient", "3.0.7") { + library("Jetty Reactive HTTPClient", "3.0.8") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From ac54afe6941f858c2ddf010eeee8677fef47dbfb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:42 +0000 Subject: [PATCH 07/17] Upgrade to jOOQ 3.17.9 Closes gh-34668 --- 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 a352e72f0e..8393011165 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -658,7 +658,7 @@ bom { ] } } - library("jOOQ", "3.17.8") { + library("jOOQ", "3.17.9") { group("org.jooq") { modules = [ "jooq", From b60583a0733992a68ddb77d77a1191888c748ddc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:47 +0000 Subject: [PATCH 08/17] Upgrade to Json-smart 2.4.10 Closes gh-34669 --- 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 8393011165..2d24a2c9f3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -679,7 +679,7 @@ bom { ] } } - library("Json-smart", "2.4.8") { + library("Json-smart", "2.4.10") { group("net.minidev") { modules = [ "json-smart" From 6fdc6fa6197d6e4e333e952e1151716d410f7743 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:52 +0000 Subject: [PATCH 09/17] Upgrade to Logback 1.4.6 This commit includes a change to stop using an API in Logback that has been deprecated without replacement. As Logback now only supports .xml configuration files, it would only ever have thrown an exception. The call to the API has been replaced with thrown an exception directly. Closes gh-34670 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../boot/logging/logback/LogbackLoggingSystem.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2d24a2c9f3..a499bb9f5d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -797,7 +797,7 @@ bom { ] } } - library("Logback", "1.4.5") { + library("Logback", "1.4.6") { group("ch.qos.logback") { modules = [ "logback-access", diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java index 33c0c60d70..ee31b9b07a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java @@ -31,7 +31,6 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.jul.LevelChangePropagator; import ch.qos.logback.classic.turbo.TurboFilter; -import ch.qos.logback.classic.util.ContextInitializer; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.OnConsoleStatusListener; @@ -267,13 +266,13 @@ public class LogbackLoggingSystem extends AbstractLoggingSystem implements BeanF private void configureByResourceUrl(LoggingInitializationContext initializationContext, LoggerContext loggerContext, URL url) throws JoranException { - if (url.toString().endsWith("xml")) { + if (url.toString().endsWith(".xml")) { JoranConfigurator configurator = new SpringBootJoranConfigurator(initializationContext); configurator.setContext(loggerContext); configurator.doConfigure(url); } else { - new ContextInitializer(loggerContext).configureByResource(url); + throw new IllegalArgumentException("Unsupported file extension in '" + url + "'. Only .xml is supported"); } } From 708e01bf6a0aef5e972872b544089b4d2246e093 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:32:58 +0000 Subject: [PATCH 10/17] Upgrade to Netty 4.1.90.Final Closes gh-34671 --- 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 a499bb9f5d..1a31bed7be 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1025,7 +1025,7 @@ bom { ] } } - library("Netty", "4.1.89.Final") { + library("Netty", "4.1.90.Final") { group("io.netty") { imports = [ "netty-bom" From cec029e8c3ef9629129d4bb1247e77680530a559 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:04 +0000 Subject: [PATCH 11/17] Upgrade to SLF4J 2.0.7 Closes gh-34672 --- 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 1a31bed7be..dc0447f6aa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1306,7 +1306,7 @@ bom { ] } } - library("SLF4J", "2.0.6") { + library("SLF4J", "2.0.7") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From 48a6086f51ea1c08770a119aefe1b67f81c2b85f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:05 +0000 Subject: [PATCH 12/17] Upgrade to Spring Data Bom 2022.0.4 Closes gh-34539 --- 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 dc0447f6aa..22b478a355 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1348,7 +1348,7 @@ bom { ] } } - library("Spring Data Bom", "2022.0.4-SNAPSHOT") { + library("Spring Data Bom", "2022.0.4") { group("org.springframework.data") { imports = [ "spring-data-bom" From 67deba5c88a69d273491e97cdc751120592f801f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:05 +0000 Subject: [PATCH 13/17] Upgrade to Spring Framework 6.0.7 Closes gh-34540 --- 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 22b478a355..d364a3a0a1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1355,7 +1355,7 @@ bom { ] } } - library("Spring Framework", "6.0.7-SNAPSHOT") { + library("Spring Framework", "6.0.7") { group("org.springframework") { imports = [ "spring-framework-bom" From 3e5ee42f6dc596edc0ff54f9b554c2b66d6fcac2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:10 +0000 Subject: [PATCH 14/17] Upgrade to Spring HATEOAS 2.0.3 Closes gh-34673 --- 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 d364a3a0a1..0e2a807708 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1370,7 +1370,7 @@ bom { ] } } - library("Spring HATEOAS", "2.0.2") { + library("Spring HATEOAS", "2.0.3") { group("org.springframework.hateoas") { modules = [ "spring-hateoas" From fe77ddca24876ddd7cac59da791cdcbe103d26e4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:11 +0000 Subject: [PATCH 15/17] Upgrade to Spring Retry 2.0.1 Closes gh-34544 --- 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 0e2a807708..d4be05dc1c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1409,7 +1409,7 @@ bom { ] } } - library("Spring Retry", "2.0.1-SNAPSHOT") { + library("Spring Retry", "2.0.1") { group("org.springframework.retry") { modules = [ "spring-retry" From f6add35f8b278f34f7e238d408a30e5d0e54446d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:16 +0000 Subject: [PATCH 16/17] Upgrade to Tomcat 10.1.7 Closes gh-34674 --- gradle.properties | 2 +- .../boot/autoconfigure/web/ServerProperties.java | 7 ++++++- .../TomcatWebServerFactoryCustomizerTests.java | 7 ++++++- .../boot/web/embedded/tomcat/TldPatterns.java | 13 ++++++++++--- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 179d749c6e..e931799037 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 -tomcatVersion=10.1.5 +tomcatVersion=10.1.7 nativeBuildToolsVersion=0.9.20 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 b68c3fe6db..ad1ee24fef 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 @@ -974,8 +974,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 6ffb41f5c3..ff433ffbf8 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 @@ -342,8 +342,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 4f37e90639..a670d38391 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"); @@ -93,6 +96,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"); @@ -111,6 +116,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("websocket-client-api.jar"); skipPatterns.add("wsdl4j*.jar"); @@ -119,6 +125,7 @@ final class TldPatterns { skipPatterns.add("xmlParserAPIs-*.jar"); skipPatterns.add("xmlParserAPIs.jar"); skipPatterns.add("xom-*.jar"); + TOMCAT_SKIP = Collections.unmodifiableSet(skipPatterns); } From e825a6eb1a5a518b1b496863f016e5974bc42081 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 21 Mar 2023 08:33:22 +0000 Subject: [PATCH 17/17] Upgrade to UnboundID LDAPSDK 6.0.8 Closes gh-34675 --- 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 d4be05dc1c..130bda6a38 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1494,7 +1494,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.7") { + library("UnboundID LDAPSDK", "6.0.8") { group("com.unboundid") { modules = [ "unboundid-ldapsdk"