mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Upgrade to Tomcat 10.0.18
Closes gh-30320
This commit is contained in:
parent
12d9127d3b
commit
af15a18e02
@ -5,6 +5,6 @@ org.gradle.parallel=true
|
|||||||
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
kotlinVersion=1.6.20-RC
|
kotlinVersion=1.6.20-RC
|
||||||
tomcatVersion=10.0.16
|
tomcatVersion=10.0.18
|
||||||
|
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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("el-api.jar");
|
||||||
skipPatterns.add("geronimo-spec-jaxrpc*.jar");
|
skipPatterns.add("geronimo-spec-jaxrpc*.jar");
|
||||||
skipPatterns.add("h2*.jar");
|
skipPatterns.add("h2*.jar");
|
||||||
|
skipPatterns.add("ha-api-*.jar");
|
||||||
skipPatterns.add("hamcrest-*.jar");
|
skipPatterns.add("hamcrest-*.jar");
|
||||||
skipPatterns.add("hibernate*.jar");
|
skipPatterns.add("hibernate*.jar");
|
||||||
skipPatterns.add("httpclient*.jar");
|
skipPatterns.add("httpclient*.jar");
|
||||||
@ -78,6 +79,7 @@ final class TldPatterns {
|
|||||||
skipPatterns.add("jaspic-api.jar");
|
skipPatterns.add("jaspic-api.jar");
|
||||||
skipPatterns.add("jaxb-*.jar");
|
skipPatterns.add("jaxb-*.jar");
|
||||||
skipPatterns.add("jaxen-*.jar");
|
skipPatterns.add("jaxen-*.jar");
|
||||||
|
skipPatterns.add("jaxws-rt-*.jar");
|
||||||
skipPatterns.add("jdom-*.jar");
|
skipPatterns.add("jdom-*.jar");
|
||||||
skipPatterns.add("jetty-*.jar");
|
skipPatterns.add("jetty-*.jar");
|
||||||
skipPatterns.add("jmx-tools.jar");
|
skipPatterns.add("jmx-tools.jar");
|
||||||
@ -177,7 +179,7 @@ final class TldPatterns {
|
|||||||
static {
|
static {
|
||||||
Set<String> scanPatterns = new LinkedHashSet<>();
|
Set<String> scanPatterns = new LinkedHashSet<>();
|
||||||
scanPatterns.add("log4j-taglib*.jar");
|
scanPatterns.add("log4j-taglib*.jar");
|
||||||
scanPatterns.add("log4j-web*.jar");
|
scanPatterns.add("log4j-jakarta-web*.jar");
|
||||||
scanPatterns.add("log4javascript*.jar");
|
scanPatterns.add("log4javascript*.jar");
|
||||||
scanPatterns.add("slf4j-taglib*.jar");
|
scanPatterns.add("slf4j-taglib*.jar");
|
||||||
TOMCAT_SCAN = Collections.unmodifiableSet(scanPatterns);
|
TOMCAT_SCAN = Collections.unmodifiableSet(scanPatterns);
|
||||||
|
@ -453,7 +453,7 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
|
|||||||
Context context = (Context) tomcat.getHost().findChildren()[0];
|
Context context = (Context) tomcat.getHost().findChildren()[0];
|
||||||
JarScanFilter jarScanFilter = context.getJarScanner().getJarScanFilter();
|
JarScanFilter jarScanFilter = context.getJarScanner().getJarScanFilter();
|
||||||
String tldScan = ((StandardJarScanFilter) jarScanFilter).getTldScan();
|
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
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user