From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 18 Mar 2023 07:29:51 +0000 (+0100)
Subject: Make license listing more readable
X-Git-Tag: v2.3.5~64
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=3a732afdebd35d5f4fc219f2f9d033e9ba94caae;p=cc0%2Fargeo-build.git

Make license listing more readable
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 65317e5..1b2d6d1 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -97,10 +97,12 @@ public class Repackage {
 		}
 		CompletableFuture.allOf(toDos.toArray(new CompletableFuture[toDos.size()])).join();
 
-		logger.log(INFO, "# License summary:");
+		// Summary
+		StringBuilder sb = new StringBuilder();
 		for (String licenseId : licensesUsed.keySet())
 			for (String name : licensesUsed.get(licenseId))
-				logger.log(INFO, licenseId + "\t" + name);
+				sb.append(licenseId + "\t" + name + "\n");
+		logger.log(INFO, "# License summary:\n" + sb);
 	}
 
 	final static String COMMON_BND = "common.bnd";
@@ -882,7 +884,7 @@ public class Repackage {
 			String spdxLicenceId = manifest.getMainAttributes().getValue(SPDX_LICENSE_IDENTIFIER.toString());
 			String bundleLicense = manifest.getMainAttributes().getValue(BUNDLE_LICENSE.toString());
 			if (spdxLicenceId == null) {
-				logger.log(WARNING, file.getFileName() + ": " + SPDX_LICENSE_IDENTIFIER + " not available, "
+				logger.log(ERROR, file.getFileName() + ": " + SPDX_LICENSE_IDENTIFIER + " not available, "
 						+ BUNDLE_LICENSE + " is " + bundleLicense);
 			} else {
 				if (!licensesUsed.containsKey(spdxLicenceId))