Merge branch '3.4.x'

Closes gh-44339
2025-02-18 21:17:14 +00:00 · 2025-02-18 21:17:14 +00:00 · e76bf84278
commit e76bf84278
parent a3eccf63a1 13bfc0442b
2 changed files with 5 additions and 1 deletions
--- a/gradle.properties
+++ b/gradle.properties
@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.5
 snakeYamlVersion=2.4
 springFrameworkVersion=6.2.3
 springFramework60xVersion=6.0.23
-tomcatVersion=10.1.36
+tomcatVersion=10.1.34

 kotlin.stdlib.default.dependency=false
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@ -2544,6 +2544,10 @@ bom {
 			versionRange "[11.0.0-M1,)"
 			because "it exceeds our Jakarte EE 10 baseline"
 		}
+		prohibit {
+			versionRange "[10.1.35,10.1.36]"
+			because "https://bz.apache.org/bugzilla/show_bug.cgi?id=69576 and related problems in 10.1.36"
+		}
 		group("org.apache.tomcat") {
 			modules = [
 				"tomcat-annotations-api",