Browse Source

Upgrade to Tomcat 9.0.60

Closes gh-30230
pull/30505/head
Stephane Nicoll 4 years ago
parent
commit
59f4004fa6
  1. 2
      gradle.properties
  2. 4
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java

2
gradle.properties

@ -5,6 +5,6 @@ org.gradle.parallel=true @@ -5,6 +5,6 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
kotlinVersion=1.5.32
tomcatVersion=9.0.58
tomcatVersion=9.0.60
kotlin.stdlib.default.dependency=false

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

@ -1,5 +1,5 @@ @@ -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 { @@ -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 { @@ -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");

Loading…
Cancel
Save