Merge branch '2.3.x' into 2.4.x

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

@@ -47,7 +47,7 @@ dependencies {
 }
 
 task syncSpringBootDependenciesBom(type: Sync) {
-	destinationDir = file("${buildDir}/generated/sources/dependencies-bom/org/springframework/boot/maven")
+	destinationDir = file("${buildDir}/generated-resources/org/springframework/boot/maven")
 	from configurations.dependenciesBom
 }
 
@@ -58,8 +58,8 @@ syncDocumentationSourceForAsciidoctor {
 }
 
 sourceSets {
-	main {
+	intTest {
-		output.dir("${buildDir}/generated/sources/dependencies-bom", builtBy: "syncSpringBootDependenciesBom")
+		output.dir("${buildDir}/generated-resources", builtBy: "syncSpringBootDependenciesBom")
 	}
 }