Merge branch '3.4.x'

wilkinsona · wilkinsona · commit 20a6ddd03aa6 · 2025-02-18T17:55:57.000Z
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -2540,10 +2540,6 @@ bom {
 		}
 	}
 	library("Tomcat", "${tomcatVersion}") {
-		prohibit {
-			versionRange "[10.1.35]"
-			because "https://bz.apache.org/bugzilla/show_bug.cgi?id=69576"
-		}
 		prohibit {
 			versionRange "[11.0.0-M1,)"
 			because "it exceeds our Jakarte EE 10 baseline"

Original file line number	Diff line number	Diff line change
`@@ -2540,10 +2540,6 @@ bom {`
`2540`	`2540`	`}`
`2541`	`2541`	`}`
`2542`	`2542`	`library("Tomcat", "${tomcatVersion}") {`
`2543`		`- prohibit {`
`2544`		`- versionRange "[10.1.35]"`
`2545`		`- because "https://bz.apache.org/bugzilla/show_bug.cgi?id=69576"`
`2546`		`- }`
`2547`	`2543`	`prohibit {`
`2548`	`2544`	`versionRange "[11.0.0-M1,)"`
`2549`	`2545`	`because "it exceeds our Jakarte EE 10 baseline"`