projects
/
cc0
/
argeo-build.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip duplicate NOTICE when merging
[cc0/argeo-build.git]
/
src
/
org
/
argeo
/
build
/
Repackage.java
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index a6c84edd81f627e86410707cfbf81b364078dcdf..d90375e3f442aae12b868223e82b52024c1566a5 100644
(file)
--- a/
src/org/argeo/build/Repackage.java
+++ b/
src/org/argeo/build/Repackage.java
@@
-584,6
+584,10
@@
public class Repackage {
} else if (entry.getName().startsWith("org/apache/batik/")) {
logger.log(TRACE, "Skip " + entry.getName());
continue entries;
} else if (entry.getName().startsWith("org/apache/batik/")) {
logger.log(TRACE, "Skip " + entry.getName());
continue entries;
+ } else if (entry.getName().startsWith("META-INF/NOTICE")) {
+ logger.log(TRACE, "Skip " + entry.getName());
+ // TODO merge them?
+ continue entries;
} else {
throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
}
} else {
throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
}