From: Jim Procter <j.procter@dundee.ac.uk>
Date: Wed, 30 Jun 2021 12:32:24 +0000 (+0100)
Subject: JAL-3847 set default behaviour as exclude when dealing with duplicate entries in... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fpatch%2FJAL-3847_gradleV7andV8Patches;p=jalview.git

JAL-3847 set default behaviour as exclude when dealing with duplicate entries in jars and zips
---

diff --git a/build.gradle b/build.gradle
index 00e3e40..67676c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,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()
@@ -1176,6 +1177,9 @@ jar {
     "Codebase": application_codebase
   }
 
+  duplicatesStrategy "EXCLUDE"
+
+
   destinationDir = file("${jalviewDir}/${package_dir}")
   archiveName = rootProject.name+".jar"
 
@@ -1236,6 +1240,9 @@ shadowJar {
   manifest {
     attributes 'Implementation-Version': JALVIEW_VERSION
   }
+
+  duplicatesStrategy "EXCLUDE"
+
   mainClassName = shadow_jar_main_class
   mergeServiceFiles()
   classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION