Merge branch '2.6.x' into 2.7.x

Closes spring-projectsgh-31261

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -143,7 +143,7 @@ task xsdResources(type: Sync) {
 }
 
 prepareMavenBinaries {
-	versions "3.8.1", "3.6.3", "3.5.4"
+	versions "3.8.5", "3.6.3", "3.5.4"
 }
 
 artifacts {