From: mbaudier Date: Mon, 9 Oct 2023 03:28:50 +0000 (+0100) Subject: Add Apache License permission X-Git-Tag: v2.3.16~1 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-jcr.git;a=commitdiff_plain;h=49be00a927cfe69a40b5c4d53775f5165d4b8471 Add Apache License permission --- diff --git a/NOTICE b/NOTICE index 6cc89a6..1179424 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 JCR statically or dynamically with other modules is making a +combined work based on Argeo JCR. 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 JCR give +you permission to combine Argeo JCR 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 JCR 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 JCR 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 JCR statically or dynamically with other modules is making a diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 2effd54..1f3e556 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -9,4 +9,4 @@ Copyright 2012-2023 Argeo GmbH 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