diff --git a/gradle.properties b/gradle.properties index b74c2dd1ec4..101e3778769 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.10 -tomcatVersion=9.0.58 +tomcatVersion=9.0.60 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 0b8b07b5642..fd1b8f4f60c 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"); @@ -77,6 +78,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");