Merge branch '2.6.x' into 2.7.x

Closes gh-32999

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1933,6 +1933,7 @@ bom {
 		group("org.xmlunit") {
 			modules = [
 				"xmlunit-assertj",
+				"xmlunit-assertj3",
 				"xmlunit-core",
 				"xmlunit-legacy",
 				"xmlunit-matchers",