Deal with NOTICE.md files

[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 6f5fbf83e9083b250c793fea6adabaa023bc3401..4561de763890974722ff1ae867ba570c8d9858c0 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -578,9 +578,9 @@ public class Repackage {
                                        }
 
                                        if (entry.getName().endsWith("NOTICE") || entry.getName().endsWith("NOTICE.txt")
-                                                       || entry.getName().endsWith("LICENSE") || entry.getName().endsWith("LICENSE.md")
-                                                       || entry.getName().endsWith("LICENSE-notice.md") || entry.getName().endsWith("COPYING")
-                                                       || entry.getName().endsWith("COPYING.LESSER")) {
+                                                       || entry.getName().endsWith("NOTICE.md") || entry.getName().endsWith("LICENSE")
+                                                       || entry.getName().endsWith("LICENSE.md") || entry.getName().endsWith("LICENSE-notice.md")
+                                                       || entry.getName().endsWith("COPYING") || entry.getName().endsWith("COPYING.LESSER")) {
                                                Path artifactOriginDir = bundleDir.resolve(ARGEO_ORIGIN).resolve(artifact.getGroupId())
                                                                .resolve(artifact.getArtifactId());
                                                Path target = artifactOriginDir.resolve(entry.getName());
@@ -1343,15 +1343,17 @@ public class Repackage {
        }
 
        /**
-        * Effectively download. Synchronised in order to avoid downloading twice in
-        * parallel.
+        * Effectively download an archive.
         */
-       synchronized Path downloadArchive(URL url, Path dir) throws IOException {
+       Path downloadArchive(URL url, Path dir) throws IOException {
                return download(url, dir, (String) null);
        }
 
-       /** Effectively download. */
-       Path download(URL url, Path dir, String name) throws IOException {
+       /**
+        * Effectively download. Synchronised in order to avoid downloading twice in
+        * parallel.
+        */
+       synchronized Path download(URL url, Path dir, String name) throws IOException {
 
                Path dest;
                if (name == null) {