root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Tomcat 9.0.60 

Closes gh-30230
This commit is contained in:
Stephane Nicoll 2022-03-16 08:28:07 +01:00
parent 417a6792a0
commit 59f4004fa6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -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.5.32 kotlinVersion=1.5.32
tomcatVersion=9.0.58 tomcatVersion=9.0.60
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java
View File

@ -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");
@ -77,6 +78,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");