| commit | 20648b34323cea083c63aec0b2424488d922189d | [log] [tgz] |
|---|---|---|
| author | Pierre De Rop <pderop@apache.org> | Fri Feb 01 17:10:51 2013 +0000 |
| committer | Pierre De Rop <pderop@apache.org> | Fri Feb 01 17:10:51 2013 +0000 |
| tree | ec9315ddde85e2c7a22b6a497b8e05a9074fa89f | |
| parent | 656e76f7fe95aa88b4a89ed2b05bd39f75a8cf3f [diff] |
FELIX-3873: Added reference to json in NOTICE annotation artifact. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1441537 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/annotation/NOTICE b/dependencymanager/annotation/NOTICE index dd331d3..6f5d219 100644 --- a/dependencymanager/annotation/NOTICE +++ b/dependencymanager/annotation/NOTICE
@@ -5,4 +5,6 @@ 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
diff --git a/dependencymanager/annotation/doc/changelog.txt b/dependencymanager/annotation/doc/changelog.txt index 2837fca..f5e267b 100644 --- a/dependencymanager/annotation/doc/changelog.txt +++ b/dependencymanager/annotation/doc/changelog.txt
@@ -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