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

8
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -26,7 +26,7 @@ dependencies {
}
task syncIntegrationTestSources(type: Sync) {
destinationDir file("${buildDir}/it")
destinationDir file(layout.buildDirectory.dir("it"))
from file("src/it")
filter(springRepositoryTransformers.ant())
}
@@ -40,7 +40,7 @@ processResources {
task integrationTest {
dependsOn syncIntegrationTestSources, jar
def resultsDir = file("${buildDir}/test-results/integrationTest")
def resultsDir = file(layout.buildDirectory.dir("test-results/integrationTest"))
inputs.dir(file("src/it")).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("source")
inputs.files(sourceSets.main.runtimeClasspath).withNormalizer(ClasspathNormalizer).withPropertyName("classpath")
outputs.dirs resultsDir
@@ -62,9 +62,9 @@ task integrationTest {
ant.propertyref(name: "ivy.class.path")
}
plainlistener()
file("${buildDir}/test-results/integrationTest").mkdirs()
file(layout.buildDirectory.dir("test-results/integrationTest")).mkdirs()
xmllistener(toDir: resultsDir)
fileset(dir: "${buildDir}/it", includes: "**/build.xml")
fileset(dir: layout.buildDirectory.dir("it").get().asFile.toString(), includes: "**/build.xml")
}
}
}

4
spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
View File

@@ -106,12 +106,12 @@ task tar(type: Tar) {
task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
dependsOn tar
outputDir = file("${buildDir}/homebrew")
outputDir = layout.buildDirectory.dir("homebrew")
template = file("src/main/homebrew/spring-boot.rb")
archive = tar.archiveFile
}
def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/spring-boot.rb")) {
def homebrewFormulaArtifact = artifacts.add("archives", file(layout.buildDirectory.file("homebrew/spring-boot.rb"))) {
type "rb"
classifier "homebrew"
builtBy "homebrewFormula"

8
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@@ -5,7 +5,7 @@ plugins {
description = "Spring Boot Loader Tools"
def generatedResources = "${buildDir}/generated-resources/main"
Provider<Directory> generatedResources = layout.buildDirectory.dir("generated-resources/main")
configurations {
loader {
@@ -62,7 +62,7 @@ task reproducibleLoaderJar(type: Jar) {
reproducibleFileOrder = true
preserveFileTimestamps = false
archiveFileName = "spring-boot-loader.jar"
destinationDirectory = file("${generatedResources}/META-INF/loader")
destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") })
}
task reproducibleLoaderClassicJar(type: Jar) {
@@ -77,7 +77,7 @@ task reproducibleLoaderClassicJar(type: Jar) {
reproducibleFileOrder = true
preserveFileTimestamps = false
archiveFileName = "spring-boot-loader-classic.jar"
destinationDirectory = file("${generatedResources}/META-INF/loader")
destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") })
}
task toolsJar(type: Sync) {
@@ -86,7 +86,7 @@ task toolsJar(type: Sync) {
file(configurations.jarmode.incoming.files.singleFile)
}
rename({ "spring-boot-jarmode-tools.jar" })
into(file("${generatedResources}/META-INF/jarmode"))
into(file(generatedResources.map { it.dir("META-INF/jarmode") }))
}
sourceSets {

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" }
}