Merge branch '1.12.x' into 1.13.x

Author: shakuzen

gradle/libs.versions.toml

@@ -74,7 +74,7 @@ rest-assured = "5.4.0"
 signalfx = "1.0.46"
 slf4j = "1.7.36"
 spectator-atlas = "1.7.21"
-spring = "5.3.37"
+spring = "5.3.39"
 spring-javaformat = "0.0.43"
 testcontainers = "1.19.8"
 tomcat = "8.5.100"