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-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 {