Merge branch '3.3.x' into 3.4.x

Closes gh-44333
This commit is contained in:
Andy Wilkinson 2025-02-18 21:14:20 +00:00
commit 13bfc0442b
2 changed files with 5 additions and 1 deletions

View File

@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.5
snakeYamlVersion=2.3 snakeYamlVersion=2.3
springFrameworkVersion=6.2.3 springFrameworkVersion=6.2.3
springFramework60xVersion=6.0.23 springFramework60xVersion=6.0.23
tomcatVersion=10.1.36 tomcatVersion=10.1.34
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false

View File

@ -2427,6 +2427,10 @@ bom {
} }
} }
library("Tomcat", "${tomcatVersion}") { 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") { group("org.apache.tomcat") {
modules = [ modules = [
"tomcat-annotations-api", "tomcat-annotations-api",