From 3a732afdebd35d5f4fc219f2f9d033e9ba94caae Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 18 Mar 2023 08:29:51 +0100 Subject: [PATCH] Make license listing more readable --- src/org/argeo/build/Repackage.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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)) -- 2.30.2