X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=5b5247bcd999a4a25b44e57568b67eb73f3dd162;hb=0180a72a24e225943ee2b7c7ebd99e4ee91529c5;hp=6f5fbf83e9083b250c793fea6adabaa023bc3401;hpb=266a8b7d16aa2f6c071b9e743d6267845dae7516;p=cc0%2Fargeo-build.git diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 6f5fbf8..5b5247b 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -438,7 +438,7 @@ public class Repackage { if (artifact.getVersion() == null) { artifact.setVersion(m2Version); } else { - logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion() + logger.log(DEBUG, p.getFileName() + " : Using version " + artifact.getVersion() + " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND); } @@ -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) {