Merge branch '4.0.x'

Closes gh-49008

Author: wilkinsona

gradle.properties

@@ -4,7 +4,7 @@ spring.build-type=oss
 
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8
 
 assertjVersion=3.27.6
 checkstyleToolVersion=10.12.4