Skip to content

Commit 59f4004

Browse files
committed
Upgrade to Tomcat 9.0.60
Closes gh-30230
1 parent 417a679 commit 59f4004

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ org.gradle.parallel=true
55
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
66

77
kotlinVersion=1.5.32
8-
tomcatVersion=9.0.58
8+
tomcatVersion=9.0.60
99

1010
kotlin.stdlib.default.dependency=false

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -68,6 +68,7 @@ final class TldPatterns {
6868
skipPatterns.add("el-api.jar");
6969
skipPatterns.add("geronimo-spec-jaxrpc*.jar");
7070
skipPatterns.add("h2*.jar");
71+
skipPatterns.add("ha-api-*.jar");
7172
skipPatterns.add("hamcrest-*.jar");
7273
skipPatterns.add("hibernate*.jar");
7374
skipPatterns.add("httpclient*.jar");
@@ -77,6 +78,7 @@ final class TldPatterns {
7778
skipPatterns.add("jaspic-api.jar");
7879
skipPatterns.add("jaxb-*.jar");
7980
skipPatterns.add("jaxen-*.jar");
81+
skipPatterns.add("jaxws-rt-*.jar");
8082
skipPatterns.add("jdom-*.jar");
8183
skipPatterns.add("jetty-*.jar");
8284
skipPatterns.add("jmx-tools.jar");

0 commit comments

Comments
 (0)