git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99ed8c5
)
JAL-3847 set default behaviour as exclude when dealing with duplicate entries in...
patch/JAL-3847_gradleV7andV8Patches
author
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 30 Jun 2021 12:32:24 +0000
(13:32 +0100)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 30 Jun 2021 12:32:24 +0000
(13:32 +0100)
build.gradle
patch
|
blob
|
history
diff --git
a/build.gradle
b/build.gradle
index
00e3e40
..
67676c9
100644
(file)
--- 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()
// 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
}
"Codebase": application_codebase
}
+ duplicatesStrategy "EXCLUDE"
+
+
destinationDir = file("${jalviewDir}/${package_dir}")
archiveName = rootProject.name+".jar"
destinationDir = file("${jalviewDir}/${package_dir}")
archiveName = rootProject.name+".jar"
@@
-1236,6
+1240,9
@@
shadowJar {
manifest {
attributes 'Implementation-Version': JALVIEW_VERSION
}
manifest {
attributes 'Implementation-Version': JALVIEW_VERSION
}
+
+ duplicatesStrategy "EXCLUDE"
+
mainClassName = shadow_jar_main_class
mergeServiceFiles()
classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION
mainClassName = shadow_jar_main_class
mergeServiceFiles()
classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION