You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 09:19:49 UTC
[28/50] [abbrv] git commit: [KARAF-2057] Fix NOTICE and LICENSE files
[KARAF-2057] Fix NOTICE and LICENSE files
git-svn-id: https://svn.apache.org/repos/asf/karaf/cave/trunk@1423448 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/1db89f79
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/1db89f79
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/1db89f79
Branch: refs/heads/master
Commit: 1db89f793be94762e6d0b48ac067d3dfb822d998
Parents: bd7cc73
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Tue Dec 18 14:43:20 2012 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Tue Dec 18 14:43:20 2012 +0000
----------------------------------------------------------------------
LICENSE | 44 ++++++++++++++++++++++++++++++++++++++++++++
NOTICE | 17 +++++++++--------
2 files changed, 53 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/1db89f79/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6b0b127..c826721 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,3 +201,47 @@
See the License for the specific language governing permissions and
limitations under the License.
+For jsoup
+Copyright © 2009 - 2012 Jonathan Hedley (jonathan@hedley.net)
+
+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.
+
+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
http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/1db89f79/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 8bf26d9..09c9776 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,20 +1,23 @@
Apache Karaf Cave
-Copyright 2010-2011 The Apache Software Foundation
+Copyright 2010-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.
-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
+JSoup (http://www.jsoup.org/).
+Licensed under the MIT License.
+
+This product uses software developed at
OPS4J (http://www.ops4j.org/).
Licensed under the Apache License 2.0.
@@ -22,8 +25,6 @@ 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
+II. License Summary
- Apache License 2.0
+- MIT License