Merge pull request #25116 from dreis2211

* pr/25116:
  Fix build deprecation warnings about duplicate jar entries

Closes gh-25116
pull/25173/head
Stephane Nicoll 4 years ago
commit 4f656d379c

@ -107,7 +107,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(

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

Loading…
Cancel
Save