Merge branch '2.4.x'

Closes gh-25837
This commit is contained in:
Andy Wilkinson
2021-03-30 20:42:41 +01:00
3 changed files with 19 additions and 14 deletions

View File

@@ -11,9 +11,11 @@ def generatedResources = "${buildDir}/generated-resources/main"
configurations {
loader {
extendsFrom dependencyManagement
transitive = false
}
jarmode {
extendsFrom dependencyManagement
transitive = false
}
}
@@ -40,10 +42,11 @@ sourceSets {
}
task reproducibleLoaderJar(type: Jar) {
dependsOn configurations.loader
from(zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
from {
zipTree(configurations.loader.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
}
reproducibleFileOrder = true
preserveFileTimestamps = false
@@ -52,10 +55,11 @@ task reproducibleLoaderJar(type: Jar) {
}
task reproducibleJarModeLayerToolsJar(type: Jar) {
dependsOn configurations.jarmode
from(zipTree(configurations.jarmode.incoming.files.filter {it.name.startsWith "spring-boot-jarmode-layertools" }.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
from {
zipTree(configurations.jarmode.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
}
reproducibleFileOrder = true
preserveFileTimestamps = false