Normalise SPDX license identifiers

diff --git a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
index 9b826357b1e65aa5674dc3b8e52fe0d876ad7a12..ce7b76805162510a56a6316e10e40ce8d8e77475 100644 (file)
--- a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
+++ b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
@@ -1,4 +1,4 @@
-SPDX-License-Identifier: LGPL-2.1
+SPDX-License-Identifier: LGPL-2.1-only
 Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30
 Import-Package: \
 com.ibm.icu.*;resolution:=optional,\

diff --git a/repackage/org.argeo.tp.utils/flying-saucer/common.bnd b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
index 00920e1209db1899a8df9d7da87a02587274f22c..c532bd7a8858c11c3ad105610b4b097de6c7e5a6 100644 (file)
--- a/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
+++ b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: LGPL-3
+SPDX-License-Identifier: LGPL-3.0-only
 Argeo-Origin-M2: :9.1.22
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/javax.mail.bnd b/repackage/org.argeo.tp.utils/javax.mail.bnd
index af9f363db144ecc36ffa5a60c3b5c7c9f4895d99..f0651a2f1ff9b38aab64a1c7d5ee5be04dfd5bd3 100644 (file)
--- a/repackage/org.argeo.tp.utils/javax.mail.bnd
+++ b/repackage/org.argeo.tp.utils/javax.mail.bnd
@@ -1,3 +1,3 @@
-SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
 Argeo-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
 Argeo-Origin-ManifestNotModified: true

diff --git a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd
index 909e5fc3422de8429dfe6349290fa6198a850454..07a78ce32a62b8743356c55cd155d473c753fb29 100644 (file)
--- a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd
+++ b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd
@@ -1,4 +1,4 @@
-SPDX-License-Identifier: CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0
 Bundle-Version: 2.4.0
 Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359
 Import-Package: \

diff --git a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
index f89f2b29c566e95ef8c9bdccc950702b4391d805..7d28b18d5a31f5429030b187928e8fd1892af45c 100644 (file)
--- a/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
+++ b/repackage/org.argeo.tp/de.thjom.java.systemd.bnd
@@ -1,2 +1,2 @@
-SPDX-License-Identifier: LGPL-2.0
+SPDX-License-Identifier: LGPL-2.0-only
 Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp/javax.servlet.bnd
index c630a23e70a84f536a7753702a12e0a5ff1348d0..4cdfc937780e7c8da71b19a357b60eedd659c626 100644 (file)
--- a/repackage/org.argeo.tp/javax.servlet.bnd
+++ b/repackage/org.argeo.tp/javax.servlet.bnd
@@ -1,3 +1,3 @@
-SPDX-License-Identifier: GPL-2.0-with-classpath-exception
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
 Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4
 Argeo-Origin-ManifestNotModified: true

diff --git a/repackage/org.argeo.tp/javax.websocket.bnd b/repackage/org.argeo.tp/javax.websocket.bnd
index 44041223ba13f8d858942cfe1a777a42e1242295..79170d572acb11fec497943c93ecf653ea203e58 100644 (file)
--- a/repackage/org.argeo.tp/javax.websocket.bnd
+++ b/repackage/org.argeo.tp/javax.websocket.bnd
@@ -1,3 +1,3 @@
-SPDX-License-Identifier: GPL-2.0-only OR CDDL-1.1
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
 Argeo-Origin-M2: javax.websocket:javax.websocket-api:1.1
 Argeo-Origin-ManifestNotModified: true