You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by pd...@apache.org on 2013/02/01 18:10:51 UTC

svn commit: r1441537 - in /felix/trunk/dependencymanager/annotation: NOTICE doc/changelog.txt

Author: pderop
Date: Fri Feb  1 17:10:51 2013
New Revision: 1441537

URL: http://svn.apache.org/viewvc?rev=1441537&view=rev
Log:
FELIX-3873: Added reference to json in NOTICE annotation artifact.

Modified:
    felix/trunk/dependencymanager/annotation/NOTICE
    felix/trunk/dependencymanager/annotation/doc/changelog.txt

Modified: felix/trunk/dependencymanager/annotation/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/NOTICE?rev=1441537&r1=1441536&r2=1441537&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/NOTICE (original)
+++ felix/trunk/dependencymanager/annotation/NOTICE Fri Feb  1 17:10:51 2013
@@ -5,4 +5,6 @@ This product includes software developed
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+Licensed under the JSON License

Modified: felix/trunk/dependencymanager/annotation/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/doc/changelog.txt?rev=1441537&r1=1441536&r2=1441537&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/doc/changelog.txt (original)
+++ felix/trunk/dependencymanager/annotation/doc/changelog.txt Fri Feb  1 17:10:51 2013
@@ -1,5 +1,12 @@
-Changes from 3.0.0 to 3.0.1
----------------------------
+Trunk
+-----
+
+** Bug
+
+    * [FELIX-3873] - Make the reference to json.org consistent in DM artifacts
+
+Release 3.1.0
+-------------
 
 ** Bug