Commit 4f656d37 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #25116 from dreis2211

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

Closes gh-25116
parents d12bb6f9 4937547b
...@@ -107,7 +107,10 @@ task fullJar(type: Jar) { ...@@ -107,7 +107,10 @@ task fullJar(type: Jar) {
into "BOOT-INF/classes" into "BOOT-INF/classes"
} }
into("") { into("") {
from zipTree(configurations.loader.singleFile) from(zipTree(configurations.loader.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
} }
manifest { manifest {
attributes( attributes(
......
...@@ -41,8 +41,9 @@ sourceSets { ...@@ -41,8 +41,9 @@ sourceSets {
task reproducibleLoaderJar(type: Jar) { task reproducibleLoaderJar(type: Jar) {
dependsOn configurations.loader dependsOn configurations.loader
from { from(zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)) {
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 reproducibleFileOrder = true
preserveFileTimestamps = false preserveFileTimestamps = false
...@@ -52,8 +53,9 @@ task reproducibleLoaderJar(type: Jar) { ...@@ -52,8 +53,9 @@ task reproducibleLoaderJar(type: Jar) {
task reproducibleJarModeLayerToolsJar(type: Jar) { task reproducibleJarModeLayerToolsJar(type: Jar) {
dependsOn configurations.jarmode dependsOn configurations.jarmode
from { from(zipTree(configurations.jarmode.incoming.files.filter {it.name.startsWith "spring-boot-jarmode-layertools" }.singleFile)) {
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 reproducibleFileOrder = true
preserveFileTimestamps = false preserveFileTimestamps = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment