Make logging less verbose

[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 442e7e0d40952d979e5432a0499fc2ec86eb2e4c..5b5247bcd999a4a25b44e57568b67eb73f3dd162 100644 (file)
--- 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());
@@ -934,8 +934,10 @@ public class Repackage {
                                                                        map.put(key.toString(), commonProps.getProperty(key.toString()));
                                                                A2Origin origin = new A2Origin();
                                                                Path bundleDir = processBundleJar(file, targetCategoryBase, map, origin);
-                                                               if (bundleDir == null)
+                                                               if (bundleDir == null) {
+                                                                       logger.log(WARNING, "No bundle dir created for " + file + ", skipping...");
                                                                        return FileVisitResult.CONTINUE;
+                                                               }
                                                                origins.put(bundleDir, origin);
                                                                logger.log(DEBUG, () -> "Processed " + file);
                                                        }
@@ -1019,6 +1021,8 @@ public class Repackage {
                Manifest sourceManifest;
                try (JarInputStream jarIn = new JarInputStream(Files.newInputStream(file), false)) {
                        sourceManifest = jarIn.getManifest();
+                       if (sourceManifest == null)
+                               logger.log(WARNING, file + " has no manifest");
                        manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
 
                        String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
@@ -1041,10 +1045,8 @@ public class Repackage {
                                nameVersion = new NameVersion(ourSymbolicName, ourVersion);
                        } else {
                                nameVersion = nameVersionFromManifest(manifest);
-                               if (nameVersion == null) {
-                                       logger.log(WARNING, file + " has no symbolic name, skipping...");
-                                       return null;
-                               }
+                               if (nameVersion == null)
+                                       throw new IllegalStateException("Could not compute name/version from Manifest");
                                if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
                                        logger.log(WARNING,
                                                        "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion);
@@ -1341,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) {