From 5957dfeea428a6a86997b740222f469f74655518 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 23 Sep 2021 09:49:27 +0100 Subject: [PATCH] Don't include binary jars in loader-tools source jar Closes gh-28113 --- .../spring-boot-loader-tools/build.gradle | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle index 54050582c50..e00521b9b6d 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle @@ -35,12 +35,6 @@ dependencies { testImplementation("org.zeroturnaround:zt-zip:1.13") } -sourceSets { - main { - resources.srcDirs generatedResources - } -} - task reproducibleLoaderJar(type: Jar) { dependsOn configurations.loader from { @@ -69,9 +63,10 @@ task reproducibleJarModeLayerToolsJar(type: Jar) { destinationDirectory = file("${generatedResources}/META-INF/jarmode") } -processResources { - dependsOn reproducibleLoaderJar - dependsOn reproducibleJarModeLayerToolsJar +sourceSets { + main { + output.dir(generatedResources, builtBy: [reproducibleJarModeLayerToolsJar, reproducibleLoaderJar]) + } } compileJava {