From a456a0c208aa4e08b1cacac2985a1b2cbeed7626 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 11 Sep 2024 11:18:56 +0100 Subject: [PATCH] Upgrade to Tomcat 10.1.29 Closes gh-42244 --- gradle.properties | 2 +- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3a45d56658..53e5294ed4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ mavenVersion=3.9.4 nativeBuildToolsVersion=0.10.3 springFrameworkVersion=6.2.0-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.28 +tomcatVersion=10.1.29 snakeYamlVersion=2.3 kotlin.stdlib.default.dependency=false 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 eeb73d715b..69ab0f7854 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 @@ -106,6 +106,7 @@ final class TldPatterns { skipPatterns.add("tagsoup-*.jar"); skipPatterns.add("tomcat-api.jar"); skipPatterns.add("tomcat-coyote.jar"); + skipPatterns.add("tomcat-coyote-ffm.jar"); skipPatterns.add("tomcat-dbcp.jar"); skipPatterns.add("tomcat-i18n-*.jar"); skipPatterns.add("tomcat-jdbc.jar");