From f60095e1803c3f716b8244057a4faefe5e767936 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 30 Jun 2021 13:32:24 +0100 Subject: [PATCH] JAL-3847 set default behaviour as exclude when dealing with duplicate entries in jars and zips --- build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle b/build.gradle index fc37a00..172f9bc 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,7 @@ repositories { } + // in ext the values are cast to Object. Ensure string values are cast as String (and not GStringImpl) for later use def string(Object o) { return o == null ? "" : o.toString() @@ -1335,6 +1336,9 @@ jar { "Codebase": application_codebase } + duplicatesStrategy "EXCLUDE" + + destinationDir = file("${jalviewDir}/${package_dir}") archiveName = rootProject.name+".jar" @@ -1396,6 +1400,9 @@ shadowJar { manifest { attributes 'Implementation-Version': JALVIEW_VERSION } + + duplicatesStrategy "EXCLUDE" + mainClassName = shadow_jar_main_class mergeServiceFiles() classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION -- 1.7.10.2