From dcd691b7a8a98c72bcfb6147d70cf7a25a22233b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 18 Mar 2023 09:35:01 +0100 Subject: [PATCH] Normalise SPDX license identifiers --- repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd | 2 +- repackage/org.argeo.tp.utils/flying-saucer/common.bnd | 2 +- repackage/org.argeo.tp.utils/javax.mail.bnd | 2 +- repackage/org.argeo.tp.utils/javax.xml.bind.bnd | 2 +- repackage/org.argeo.tp/de.thjom.java.systemd.bnd | 2 +- repackage/org.argeo.tp/javax.servlet.bnd | 2 +- repackage/org.argeo.tp/javax.websocket.bnd | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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 9b82635..ce7b768 100644 --- 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 00920e1..c532bd7 100644 --- 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 af9f363..f0651a2 100644 --- 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 909e5fc..07a78ce 100644 --- 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 f89f2b2..7d28b18 100644 --- 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 c630a23..4cdfc93 100644 --- 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 4404122..79170d5 100644 --- 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 -- 2.30.2