Merge branch '2.7.x'

Closes gh-31950
This commit is contained in:
Andy Wilkinson 2022-08-01 20:51:40 +01:00
commit 8a2cdb9759
2 changed files with 10 additions and 11 deletions

View File

@ -15,3 +15,8 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
}
jar {
reproducibleFileOrder = true
preserveFileTimestamps = false
}

View File

@ -50,24 +50,18 @@ task reproducibleLoaderJar(type: Jar) {
destinationDirectory = file("${generatedResources}/META-INF/loader")
}
task reproducibleJarModeLayerToolsJar(type: Jar) {
task layerToolsJar(type: Sync) {
dependsOn configurations.jarmode
from {
zipTree(configurations.jarmode.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
exclude "META-INF/spring-boot.properties"
}
file(configurations.jarmode.incoming.files.singleFile)
}
reproducibleFileOrder = true
preserveFileTimestamps = false
archiveFileName = "spring-boot-jarmode-layertools.jar"
destinationDirectory = file("${generatedResources}/META-INF/jarmode")
rename({ "spring-boot-jarmode-layertools.jar" })
into(file("${generatedResources}/META-INF/jarmode"))
}
sourceSets {
main {
output.dir(generatedResources, builtBy: [reproducibleJarModeLayerToolsJar, reproducibleLoaderJar])
output.dir(generatedResources, builtBy: [layerToolsJar, reproducibleLoaderJar])
}
}