Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42772
This commit is contained in:
Moritz Halbritter
2024-10-17 17:52:55 +02:00
parent fb9fee4ed8 ce106eb43c
commit 73150b799a
17 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@@ -93,19 +93,19 @@ ext {
task copySettingsXml(type: Copy) {
from file("src/intTest/projects/settings.xml")
into "${buildDir}/generated-resources/settings"
into layout.buildDirectory.dir("generated-resources/settings")
filter(springRepositoryTransformers.mavenSettings())
}
sourceSets {
main {
output.dir("${buildDir}/generated/resources/xsd", builtBy: "xsdResources")
output.dir(layout.buildDirectory.dir("generated/resources/xsd"), builtBy: "xsdResources")
}
intTest {
output.dir("${buildDir}/generated-resources", builtBy: ["extractVersionProperties", "copySettingsXml"])
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: ["extractVersionProperties", "copySettingsXml"])
}
dockerTest {
output.dir("${buildDir}/generated-resources", builtBy: "extractVersionProperties")
output.dir(layout.buildDirectory.dir("generated-resources"), builtBy: "extractVersionProperties")
}
}
@@ -124,7 +124,7 @@ javadoc {
task xsdResources(type: Sync) {
from "src/main/xsd/layers-${project.ext.xsdVersion}.xsd"
into "${buildDir}/generated/resources/xsd/org/springframework/boot/maven"
into layout.buildDirectory.dir("generated/resources/xsd/org/springframework/boot/maven")
rename { fileName -> "layers.xsd" }
}