From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 13 Sep 2023 04:17:41 +0000 (+0200)
Subject: Skip duplicate NOTICE when merging
X-Git-Tag: v2.3.8~25
X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=dfd187de84f409ad58d2f931bcdd17cd699a9a1d

Skip duplicate NOTICE when merging
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index a6c84ed..d90375e 100644
--- 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("META-INF/NOTICE")) {
+							logger.log(TRACE, "Skip " + entry.getName());
+							// TODO merge them?
+							continue entries;
 						} else {
 							throw new IllegalStateException("File " + target + " from " + artifact + " already exists");
 						}