Merge branch '2.3.x' into 2.4.x

See gh-25836
pull/26153/head
Andy Wilkinson 4 years ago
commit 563b8a8cec

@ -103,6 +103,7 @@ test {
} }
task fullJar(type: Jar) { task fullJar(type: Jar) {
dependsOn configurations.loader
classifier = "full" classifier = "full"
entryCompression = "stored" entryCompression = "stored"
from(configurations.runtimeClasspath) { from(configurations.runtimeClasspath) {

@ -42,6 +42,7 @@ sourceSets {
} }
task reproducibleLoaderJar(type: Jar) { task reproducibleLoaderJar(type: Jar) {
dependsOn configurations.loader
from { from {
zipTree(configurations.loader.incoming.files.singleFile).matching { zipTree(configurations.loader.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt" exclude "META-INF/LICENSE.txt"
@ -55,6 +56,7 @@ task reproducibleLoaderJar(type: Jar) {
} }
task reproducibleJarModeLayerToolsJar(type: Jar) { task reproducibleJarModeLayerToolsJar(type: Jar) {
dependsOn configurations.jarmode
from { from {
zipTree(configurations.jarmode.incoming.files.singleFile).matching { zipTree(configurations.jarmode.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt" exclude "META-INF/LICENSE.txt"

Loading…
Cancel
Save