From: mbaudier <mbaudier@mdesktop001.work.argeo.net>
Date: Mon, 9 Oct 2023 03:28:42 +0000 (+0100)
Subject: Add Apache License permission
X-Git-Tag: v2.3.19~1
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=1411f28fcc919af4cd509bb744264409d2ecac82;p=lgpl%2Fargeo-commons.git

Add Apache License permission
---

diff --git a/NOTICE b/NOTICE
index 0db946a93..afa7583ab 100644
--- a/NOTICE
+++ b/NOTICE
@@ -58,6 +58,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 Commons statically or dynamically with other modules is making a 
+combined work based on Argeo Commons. 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 Commons give 
+you permission to combine Argeo Commons 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 Commons 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 Commons 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 Commons statically or dynamically with other modules is making a 
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index be6f633f8..0ab0eca42 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -10,4 +10,4 @@ Copyright 2012-2023 Argeo GmbH
 SPDX-License-Identifier= \
 LGPL-2.1-or-later \
 OR EPL-2.0 \
-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