From 106df8add40429c673f5f39e4ef2d7e44532c871 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 9 Oct 2023 04:30:59 +0100 Subject: [PATCH] Add Apache License permission --- NOTICE | 21 +++++++++++++++++++++ sdk/branches/unstable.bnd | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 583ff42..de09206 100644 --- a/NOTICE +++ b/NOTICE @@ -39,6 +39,27 @@ whether to do so. The GNU General Public License gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. +# Apache License Permission + +Linking Argeo Suite statically or dynamically with other modules is making a +combined work based on Argeo Suite. Thus, the terms and conditions of the GNU +General Public License cover the whole combination when this license becomes +applicable. + +In addition, as a special exception, the copyright holders of Argeo Suite give +you permission to combine Argeo Suite with any program released under the +terms and conditions of the Apache License v2.0 or any later version of this +license. You may copy and distribute such a system following the terms of +the GNU GPL for Argeo Suite and the licenses of the other code concerned, +provided that you include the source code of that other code when and as +the GNU GPL requires distribution of source code. + +Note that people who make modified versions of Argeo Suite are not obligated +to grant this special exception for their modified versions; it is their choice +whether to do so. The GNU General Public License gives permission to release a +modified version without this exception; this exception also makes it possible +to release a modified version which carries forward this exception. + # Java Content Repository API version 2.0 Permission Linking Argeo Suite statically or dynamically with other modules is making a diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 8217d67..56f74db 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -9,4 +9,4 @@ Copyright 2017-2023 Mathieu Baudier SPDX-License-Identifier= \ GPL-2.0-or-later \ -OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-JCR-permissions +OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-Apache-and-JCR-permissions -- 2.30.2