Prepare next development cycle

[gpl/argeo-jcr.git] / NOTICE

diff --git a/NOTICE b/NOTICE
index 6cc89a6e03e07540e5ccdcd5f9b8f4089ac51e6a..1179424fc370ecb437f8fbdcb1cf580205526db7 100644 (file)
--- 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