Merge branch '2.3.x' into 2.4.x

Closes gh-25140
This commit is contained in:
Stephane Nicoll 2021-02-09 15:04:28 +01:00
commit 9218965104
2 changed files with 10 additions and 5 deletions

View File

@ -108,7 +108,10 @@ task fullJar(type: Jar) {
into "BOOT-INF/classes"
}
into("") {
from zipTree(configurations.loader.singleFile)
from(zipTree(configurations.loader.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
}
manifest {
attributes(

View File

@ -41,8 +41,9 @@ sourceSets {
task reproducibleLoaderJar(type: Jar) {
dependsOn configurations.loader
from {
zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)
from(zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
reproducibleFileOrder = true
preserveFileTimestamps = false
@ -52,8 +53,9 @@ 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)
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"
}
reproducibleFileOrder = true
preserveFileTimestamps = false