Merge branch '3.3.x' into 3.4.x

wilkinsona · wilkinsona · commit 13bfc0442bad · 2025-02-18T21:14:20.000Z
Closes gh-44333
diff --git a/gradle.properties b/gradle.properties
@@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.5
 snakeYamlVersion=2.3
 springFrameworkVersion=6.2.3
 springFramework60xVersion=6.0.23
-tomcatVersion=10.1.36
+tomcatVersion=10.1.34
 
 kotlin.stdlib.default.dependency=false
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -2427,6 +2427,10 @@ bom {
 		}
 	}
 	library("Tomcat", "${tomcatVersion}") {
+		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",

Original file line number	Diff line number	Diff line change
`@@ -2427,6 +2427,10 @@ bom {`
`2427`	`2427`	`}`
`2428`	`2428`	`}`
`2429`	`2429`	`library("Tomcat", "${tomcatVersion}") {`
	`2430`	`+ prohibit {`
	`2431`	`+ versionRange "[10.1.35,10.1.36]"`
	`2432`	`+ because "https://bz.apache.org/bugzilla/show_bug.cgi?id=69576 and related problems in 10.1.36"`
	`2433`	`+ }`
`2430`	`2434`	`group("org.apache.tomcat") {`
`2431`	`2435`	`modules = [`
`2432`	`2436`	`"tomcat-annotations-api",`