svn commit: r817186 - in /felix/trunk/karaf: NOTICE assembly/NOTICE

[gn...@apache.org]

Author: gnodet
Date: Mon Sep 21 07:53:41 2009
New Revision: 817186

URL: http://svn.apache.org/viewvc?rev=817186&view=rev
Log:
Fix a few more NOTICE files

Modified:
    felix/trunk/karaf/NOTICE
    felix/trunk/karaf/assembly/NOTICE

Modified: felix/trunk/karaf/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/NOTICE?rev=817186&r1=817185&r2=817186&view=diff
==============================================================================
--- felix/trunk/karaf/NOTICE (original)
+++ felix/trunk/karaf/NOTICE Mon Sep 21 07:53:41 2009
@@ -20,6 +20,25 @@
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
 
 III. License Summary
 - Apache License 2.0

Modified: felix/trunk/karaf/assembly/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/NOTICE?rev=817186&r1=817185&r2=817186&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/assembly/NOTICE Mon Sep 21 07:53:41 2009
@@ -42,10 +42,14 @@
 Antony Lesuisse.
 Licensed under Public Domain.
 
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
 
 III. License Summary
 - Apache License 2.0
 - Eclipse Public License 1.0
-- Public Domain
+- BSD License
+- MIT License