From af15a18e025f16a418e3d5d356b1f5fd297ed038 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 18 Mar 2022 16:55:16 +0100 Subject: [PATCH] Upgrade to Tomcat 10.0.18 Closes gh-30320 --- gradle.properties | 2 +- .../boot/web/embedded/tomcat/TldPatterns.java | 6 ++++-- .../embedded/tomcat/TomcatServletWebServerFactoryTests.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index c360d13e1f..a58a76c4c3 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.20-RC -tomcatVersion=10.0.16 +tomcatVersion=10.0.18 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 04b16d2976..438127097b 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-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. @@ -68,6 +68,7 @@ final class TldPatterns { skipPatterns.add("el-api.jar"); skipPatterns.add("geronimo-spec-jaxrpc*.jar"); skipPatterns.add("h2*.jar"); + skipPatterns.add("ha-api-*.jar"); skipPatterns.add("hamcrest-*.jar"); skipPatterns.add("hibernate*.jar"); skipPatterns.add("httpclient*.jar"); @@ -78,6 +79,7 @@ final class TldPatterns { skipPatterns.add("jaspic-api.jar"); skipPatterns.add("jaxb-*.jar"); skipPatterns.add("jaxen-*.jar"); + skipPatterns.add("jaxws-rt-*.jar"); skipPatterns.add("jdom-*.jar"); skipPatterns.add("jetty-*.jar"); skipPatterns.add("jmx-tools.jar"); @@ -177,7 +179,7 @@ final class TldPatterns { static { Set scanPatterns = new LinkedHashSet<>(); scanPatterns.add("log4j-taglib*.jar"); - scanPatterns.add("log4j-web*.jar"); + scanPatterns.add("log4j-jakarta-web*.jar"); scanPatterns.add("log4javascript*.jar"); scanPatterns.add("slf4j-taglib*.jar"); TOMCAT_SCAN = Collections.unmodifiableSet(scanPatterns); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java index c8e87f982f..cbf256e7ae 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java @@ -453,7 +453,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory Context context = (Context) tomcat.getHost().findChildren()[0]; JarScanFilter jarScanFilter = context.getJarScanner().getJarScanFilter(); String tldScan = ((StandardJarScanFilter) jarScanFilter).getTldScan(); - assertThat(tldScan).isEqualTo("log4j-taglib*.jar,log4j-web*.jar,log4javascript*.jar,slf4j-taglib*.jar"); + assertThat(tldScan).isEqualTo("log4j-taglib*.jar,log4j-jakarta-web*.jar,log4javascript*.jar,slf4j-taglib*.jar"); } @Test