svn commit: r1423445 - in /karaf/cellar/trunk: LICENSE NOTICE

[jb...@apache.org]

Author: jbonofre
Date: Tue Dec 18 14:30:50 2012
New Revision: 1423445

URL: http://svn.apache.org/viewvc?rev=1423445&view=rev
Log:
[KARAF-2057] Fix LICENSE and NOTICE files

Modified:
    karaf/cellar/trunk/LICENSE
    karaf/cellar/trunk/NOTICE

Modified: karaf/cellar/trunk/LICENSE
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/LICENSE?rev=1423445&r1=1423444&r2=1423445&view=diff
==============================================================================
--- karaf/cellar/trunk/LICENSE (original)
+++ karaf/cellar/trunk/LICENSE Tue Dec 18 14:30:50 2012
@@ -201,3 +201,25 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+For slf4j
+Copyright (c) 2004-2011 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

Modified: karaf/cellar/trunk/NOTICE
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/NOTICE?rev=1423445&r1=1423444&r2=1423445&view=diff
==============================================================================
--- karaf/cellar/trunk/NOTICE (original)
+++ karaf/cellar/trunk/NOTICE Tue Dec 18 14:30:50 2012
@@ -1,23 +1,19 @@
 Apache Karaf Cellar
-Copyright 2011 The Apache Software Foundation
+Copyright 2011-2012 The Apache Software Foundation
 
 
-I. Included Software
+I. Used Software
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
 This product uses software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+Hazelcast (http://www.hazelcast.com/).
 Licensed under the Apache License 2.0.
 
 This product uses software developed at
@@ -33,10 +29,6 @@ JClouds (http://www.jclouds.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.
 
@@ -44,5 +36,6 @@ This product includes software from http
 Copyright (c) 2002 JSON.org
 
 
-III. License Summary
+II. License Summary
 - Apache License 2.0
+- MIT License