From 9ff6bb31c5e817731483322cffa19bf477afb9c5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 18 Mar 2023 08:41:20 +0100 Subject: [PATCH] Clarify licensing --- .../org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd | 2 +- repackage/org.argeo.tp.jcr/javax.jcr.bnd | 4 ++-- repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd | 1 + repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd | 1 + sdk/argeo-build | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/repackage/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd b/repackage/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd index 696295c..92a2950 100644 --- a/repackage/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd +++ b/repackage/org.argeo.tp.jcr/EDU.oswego.cs.dl.util.concurrent.bnd @@ -1,2 +1,2 @@ -SPDX-License-Identifier: Public Domain +SPDX-License-Identifier: CC0-1.0 Argeo-Origin-M2: concurrent:concurrent:1.3.4 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/javax.jcr.bnd b/repackage/org.argeo.tp.jcr/javax.jcr.bnd index 3428803..aaf9930 100644 --- a/repackage/org.argeo.tp.jcr/javax.jcr.bnd +++ b/repackage/org.argeo.tp.jcr/javax.jcr.bnd @@ -1,4 +1,4 @@ -SPDX-License-Identifier: https://www.adobe.io/experience-manager/reference-materials/spec/jcr/2.0/license.html -Bundle-Version: 2.0.0 +SPDX-License-Identifier: +Bundle-License: https://www.adobe.io/experience-manager/reference-materials/spec/jcr/2.0/license.html Argeo-Origin-M2: javax.jcr:jcr:2.0 Argeo-Origin-ManifestNotModified: true diff --git a/repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd b/repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd index a71e186..f99ebd5 100644 --- a/repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd +++ b/repackage/osgi/api/org.argeo.tp.osgi/osgi.cmpn.bnd @@ -1,2 +1,3 @@ Argeo-Origin-M2: org.osgi:osgi.cmpn:7.0.0 Argeo-Origin-ManifestNotModified: true +SPDX-License-Identifier: Apache-2.0 diff --git a/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd b/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd index 5775b89..be5ba8a 100644 --- a/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd +++ b/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd @@ -1,2 +1,3 @@ Argeo-Origin-M2: org.osgi:osgi.core:7.0.0 Argeo-Origin-ManifestNotModified: true +SPDX-License-Identifier: Apache-2.0 diff --git a/sdk/argeo-build b/sdk/argeo-build index fafc98b..56823b2 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit fafc98ba3bed1f1f9683324ad9c11f0402c2d687 +Subproject commit 56823b2fa7daf14ccff45e329f9653cdc3273ec4 -- 2.30.2