From 8c6726738645290a54ac4b6ca7ecf5552ad549c8 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 7 Oct 2023 06:49:13 +0200 Subject: [PATCH] Fix JNA license in workaround --- src/org/argeo/build/Repackage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index e0f3d1d..7f11f21 100644 --- a/src/org/argeo/build/Repackage.java +++ b/src/org/argeo/build/Repackage.java @@ -1486,8 +1486,9 @@ public class Repackage { // license String spdxLicenseId = SPDX_LICENSE_IDENTIFIER.get(mapping); if (spdxLicenseId == null) { - if (jarDir.getFileName().toString().startsWith("com.sun.jna")) - spdxLicenseId = "LGPL-2.1 OR Apache-2.0"; + if (jarDir.getFileName().toString().startsWith("com.sun.jna")) // FIXME understand/report why JNA's + // jar is corrupted + spdxLicenseId = "LGPL-2.1-or-later OR Apache-2.0"; else throw new IllegalStateException( "An SPDX license id must have beend defined for " + jarDir + " at this stage."); -- 2.30.2