projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c89e00b
)
Fix JNA license in workaround
author
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 04:49:13 +0000
(06:49 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sat, 7 Oct 2023 04:49:13 +0000
(06:49 +0200)
src/org/argeo/build/Repackage.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Repackage.java
b/src/org/argeo/build/Repackage.java
index e0f3d1d163052bbaf5b89e745041cd467d48d04b..7f11f21953d6f055f916edb0e982943a38835637 100644
(file)
--- 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) {
// 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.");
else
throw new IllegalStateException(
"An SPDX license id must have beend defined for " + jarDir + " at this stage.");