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 11.0.6 

Closes gh-45475
This commit is contained in:
Stéphane Nicoll 2025-05-07 10:48:14 -07:00 committed by Phillip Webb
parent fd061220a7
commit baefbc1aff
6 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6
snakeYamlVersion=2.4
springFrameworkVersion=6.2.7-SNAPSHOT
springFramework60xVersion=6.0.23
tomcatVersion=10.1.40
tomcatVersion=11.0.6
kotlin.stdlib.default.dependency=false

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@ -517,7 +517,7 @@ public class ServerProperties {
* Maximum number of parameters (GET plus POST) that will be automatically parsed
* by the container. A value of less than 0 means no limit.
*/
private int maxParameterCount = 10000;
private int maxParameterCount = 1000;
/**
* Whether to use APR.

4
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -2514,10 +2514,6 @@ bom {
}
}
library("Tomcat", "${tomcatVersion}") {
prohibit {
versionRange "[11.0.0-M1,)"
because "it exceeds our Jakarte EE 10 baseline"
}
group("org.apache.tomcat") {
modules = [
"tomcat-annotations-api",

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2025 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.
@ -33,7 +33,6 @@ class DisableReferenceClearingContextCustomizer implements TomcatContextCustomiz
return;
}
try {
standardContext.setClearReferencesObjectStreamClassCaches(false);
standardContext.setClearReferencesRmiTargets(false);
standardContext.setClearReferencesThreadLocals(false);
}

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java
View File

@ -220,7 +220,6 @@ class TomcatReactiveWebServerFactoryTests extends AbstractReactiveWebServerFacto
this.webServer.start();
Tomcat tomcat = ((TomcatWebServer) this.webServer).getTomcat();
StandardContext context = (StandardContext) tomcat.getHost().findChildren()[0];
assertThat(context.getClearReferencesObjectStreamClassCaches()).isFalse();
assertThat(context.getClearReferencesRmiTargets()).isFalse();
assertThat(context.getClearReferencesThreadLocals()).isFalse();
}

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
View File

@ -538,7 +538,6 @@ class TomcatServletWebServerFactoryTests extends AbstractServletWebServerFactory
this.webServer.start();
Tomcat tomcat = ((TomcatWebServer) this.webServer).getTomcat();
StandardContext context = (StandardContext) tomcat.getHost().findChildren()[0];
assertThat(context.getClearReferencesObjectStreamClassCaches()).isFalse();
assertThat(context.getClearReferencesRmiTargets()).isFalse();
assertThat(context.getClearReferencesThreadLocals()).isFalse();
}