Merge branch '2.3.x' into 2.4.x

9af6c895 · Phillip Webb · 11a94ee6 · 2b591387 · 9af6c895
Commit 9af6c895 authored Mar 23, 2021 by Phillip Webb
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

TldPatterns.java ...springframework/boot/web/embedded/tomcat/TldPatterns.java +2 -0

No files found.
--- 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
@@ -154,6 +154,8 @@ final class TldPatterns {
 		skipPatterns.add("spring-oxm-*.jar");
 		skipPatterns.add("spring-tx-*.jar");
 		skipPatterns.add("snakeyaml-*.jar");
+		skipPatterns.add("tomcat-embed-core-*.jar");
+		skipPatterns.add("tomcat-embed-logging-*.jar");
 		skipPatterns.add("tomcat-embed-el-*.jar");
 		skipPatterns.add("validation-api-*.jar");
 		ADDITIONAL_SKIP = Collections.unmodifiableSet(skipPatterns);