Skip to content

Commit c0daede

Browse files
committed
Ensure that jarmode jar added to an app has same SHA as published jar
Closes gh-31862
1 parent 66a93a3 commit c0daede

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@ dependencies {
1515
testImplementation("org.mockito:mockito-core")
1616
testImplementation("org.mockito:mockito-junit-jupiter")
1717
}
18+
19+
jar {
20+
reproducibleFileOrder = true
21+
preserveFileTimestamps = false
22+
}

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,18 @@ task reproducibleLoaderJar(type: Jar) {
4949
destinationDirectory = file("${generatedResources}/META-INF/loader")
5050
}
5151

52-
task reproducibleJarModeLayerToolsJar(type: Jar) {
52+
task layerToolsJar(type: Sync) {
5353
dependsOn configurations.jarmode
5454
from {
55-
zipTree(configurations.jarmode.incoming.files.singleFile).matching {
56-
exclude "META-INF/LICENSE.txt"
57-
exclude "META-INF/NOTICE.txt"
58-
}
55+
file(configurations.jarmode.incoming.files.singleFile)
5956
}
60-
reproducibleFileOrder = true
61-
preserveFileTimestamps = false
62-
archiveFileName = "spring-boot-jarmode-layertools.jar"
63-
destinationDirectory = file("${generatedResources}/META-INF/jarmode")
57+
rename({ "spring-boot-jarmode-layertools.jar" })
58+
into(file("${generatedResources}/META-INF/jarmode"))
6459
}
6560

6661
sourceSets {
6762
main {
68-
output.dir(generatedResources, builtBy: [reproducibleJarModeLayerToolsJar, reproducibleLoaderJar])
63+
output.dir(generatedResources, builtBy: [layerToolsJar, reproducibleLoaderJar])
6964
}
7065
}
7166

0 commit comments

Comments
 (0)