X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=1a1f5c1d4b26fdfb768a476da0e1c832daa20ea2;hb=de19d534e689ec02c08faf7e34b471cd9c45516e;hp=ca5242e415d49bb2e767100efdaddf2594f5d679;hpb=0130d79e9b422fa78797e8a0c886d9cc3d2a47fe;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index ca5242e..1a1f5c1 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1046,11 +1046,12 @@ public class Repackage {
 			} else {
 				nameVersion = nameVersionFromManifest(manifest);
 				if (nameVersion == null) {
-					logger.log(WARNING, file + " has no symbolic name, trying name/version based on its name");
 					// hack for weird issue with JNA jar in Eclipse
 					String[] arr_ = file.getFileName().toString().split("_");
 					String v = arr_[1].substring(0, arr_[1].length() - 4);// remove .jar
 					nameVersion = new NameVersion(arr_[0], v);
+					logger.log(WARNING, file + " has no symbolic name, trying " + nameVersion.getName() + "/"
+							+ nameVersion.getVersion() + " based on its name");
 				}
 				if (ourVersion != null && !nameVersion.getVersion().equals(ourVersion)) {
 					logger.log(WARNING,
@@ -1484,8 +1485,13 @@ public class Repackage {
 
 			// license
 			String spdxLicenseId = SPDX_LICENSE_IDENTIFIER.get(mapping);
-			if (spdxLicenseId == null)
-				throw new IllegalStateException("An SPDX license id must have beend defined at this stage.");
+			if (spdxLicenseId == null) {
+				if (jarDir.getFileName().toString().startsWith("com.sun.jna"))
+					spdxLicenseId = "Apache-2.0 OR LGPL-2.1";
+				else
+					throw new IllegalStateException(
+							"An SPDX license id must have beend defined for " + jarDir + " at this stage.");
+			}
 			writer.append("\nIt is redistributed under the following license:\n\n");
 			writer.append("SPDX-Identifier: " + spdxLicenseId + "\n\n");