From 6203d6605b4e483113c0c11333f1e52719f4fe48 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 7 Oct 2023 06:21:19 +0200 Subject: [PATCH] Deal with jars without symbolic name --- src/org/argeo/build/Repackage.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index f0d048c..442e7e0 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -934,6 +934,8 @@ 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) + return FileVisitResult.CONTINUE; origins.put(bundleDir, origin); logger.log(DEBUG, () -> "Processed " + file); } @@ -1039,6 +1041,10 @@ 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 (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) { logger.log(WARNING, "Original version is " + nameVersion.getVersion() + " while new version is " + ourVersion); -- 2.30.2