From: Mathieu Baudier Date: Sat, 7 Oct 2023 04:49:13 +0000 (+0200) Subject: Fix JNA license in workaround X-Git-Tag: v2.3.8~3 X-Git-Url: https://git.argeo.org/?p=cc0%2Fargeo-build.git;a=commitdiff_plain;h=8c6726738645290a54ac4b6ca7ecf5552ad549c8 Fix JNA license in workaround --- 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.");