Merge branch '2.6.x' into 2.7.x

Closes gh-29009

buildSrc/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 	implementation("org.springframework:spring-web:5.2.2.RELEASE")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
 	testImplementation("org.assertj:assertj-core:3.11.1")
-	testImplementation("org.apache.logging.log4j:log4j-core:2.12.1")
+	testImplementation("org.apache.logging.log4j:log4j-core:2.15.0")
 	testImplementation("org.junit.jupiter:junit-jupiter:5.6.0")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }