Merge branch '3.3.x' into 3.4.x

wilkinsona · wilkinsona · commit 213383ce2672 · 2025-02-18T17:55:13.000Z
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -2427,10 +2427,6 @@ bom {
 		}
 	}
 	library("Tomcat", "${tomcatVersion}") {
-		prohibit {
-			versionRange "[10.1.35]"
-			because "https://bz.apache.org/bugzilla/show_bug.cgi?id=69576"
-		}
 		group("org.apache.tomcat") {
 			modules = [
 				"tomcat-annotations-api",

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