You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/06/10 03:00:21 UTC
[27/28] storm git commit: fix NOTICE/LICENSE files
fix NOTICE/LICENSE files
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/27bc183c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/27bc183c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/27bc183c
Branch: refs/heads/0.10.x-branch
Commit: 27bc183c0f1e33fefb19b640f8a91f563c60ce61
Parents: 531e9c0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Jun 9 15:06:48 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Jun 9 15:06:48 2015 -0400
----------------------------------------------------------------------
NOTICE | 4 +-
storm-dist/binary/LICENSE | 224 ++++++++++++++++++++++++++++++-----------
storm-dist/binary/NOTICE | 4 +-
3 files changed, 172 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 637e578..39041e4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache Storm
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
-Copyright (c) 2012-2014 Yahoo! Inc.
\ No newline at end of file
+Copyright (c) 2012-2015 Yahoo! Inc.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/storm-dist/binary/LICENSE
----------------------------------------------------------------------
diff --git a/storm-dist/binary/LICENSE b/storm-dist/binary/LICENSE
index 1a8c4a8..b52a6b5 100644
--- a/storm-dist/binary/LICENSE
+++ b/storm-dist/binary/LICENSE
@@ -203,22 +203,6 @@
-----------------------------------------------------------------------
-logback License
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2012, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
-
- or (per the licensee's choosing)
-
-under the terms of the GNU Lesser General Public License version 2.1
-as published by the Free Software Foundation.
-
------------------------------------------------------------------------
-
slf4j License
Copyright (c) 2004-2013 QOS.ch
@@ -245,14 +229,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js)
-
-jQuery JavaScript Library v1.6.2
-http://jquery.com/
-
-Copyright 2011, John Resig
-Dual licensed under the MIT or GPL Version 2 licenses.
-http://jquery.org/license
+For jQuery 1.11.1 (storm-core/src/ui/public/js/jquery-1.11.1.min.js)
Includes Sizzle.js
http://sizzlejs.com/
@@ -261,6 +238,8 @@ Released under the MIT, BSD, and GPL Licenses.
MIT license selected:
+Copyright 2014 jQuery Foundation and other contributors
+http://jquery.com/
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
@@ -268,10 +247,8 @@ 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
@@ -307,35 +284,16 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------
-For jQuery TableSorter 2.0.5b (storm-core/src/ui/public/js/jquery.tablesorter.min.js)
-
-Copyright (c) 2007 Christian Bach
-Examples and docs at: http://tablesorter.com
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-MIT license selected:
-
-Copyright (c) 2007 Christian Bach
+Copyright (c) 2008-2010, Allan Jardine
+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:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse or promote products derived from this software without specific prior written permission.
-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.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-----------------------------------------------------------------------
@@ -424,6 +382,61 @@ For Arbor Tween (storm-core/src/ui/public/js/arbor-tween.js)
-----------------------------------------------------------------------
+For mustache.js (storm-core/src/ui/public/js/jquery.mustache.js)
+
+The MIT License
+
+Copyright (c) 2009 Chris Wanstrath (Ruby)
+Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
+
+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 moment.js (storm-core/src/ui/public/js/moment.min.js)
+
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+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 Jquery url plugin (storm-core/src/ui/public/js/url.min.js)
Jquery Url (A Jquery plugin for URL parser) v1.8.6
@@ -432,12 +445,41 @@ Licensed under an MIT-style license. Seehttps://github.com/websanova/js-url#lice
-----------------------------------------------------------------------
-For mustache.js (storm-core/src/ui/public/js/jquery.mustache.js)
-The MIT License
+For jquery.blockUI.min.js (storm-core/src/ui/public/js/jquery.blockUI.min.js)
-Copyright (c) 2009 Chris Wanstrath (Ruby)
-Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
+jQuery BlockUI; v20131009
+http://jquery.malsup.com/block/
+Copyright (c) 2013 M. Alsup; Dual licensed: MIT/GPL
+
+Copyright © 2007-2013 M. Alsup.
+
+MIT license selected:
+
+The BlockUI plugin is dual licensed under the MIT and GPL licenses.
+
+You may use either license. The MIT license is recommended for most projects
+because it is simple and easy to understand and it places almost no
+restrictions on what you can do with the plugin.
+
+If the GPL suits your project better you are also free to use the plugin
+under that license.
+
+You do not have to do anything special to choose one license or the other and
+you don't have to notify anyone which license you are using. You are free to
+use the BlockUI plugin in commercial projects as long as the copyright header is left intact.
+
+-----------------------------------------------------------------------
+
+For jquery dataTables v1.10.4
+
+(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
+storm-core/src/ui/public/css/jquery.dataTables.1.10.4.min.css
+storm-core/src/ui/public/images/{{back, forward}_{disabled, enabled, enabled_hover}}.png
+storm-core/src/ui/public/images/{sort_{asc, asc_disabled, both, desc, desc_disabled}}.png)
+
+Copyright (c) 2008-2013 SpryMedia Limited
+http://datatables.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
@@ -456,3 +498,73 @@ 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 jquery dataTables bootstrap integration
+
+(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
+torm-core/src/ui/public/css/dataTables.bootstrap.css)
+
+Copyright (c) 2013-2014 SpryMedia Limited
+http://datatables.net/license
+https://github.com/DataTables/Plugins/tree/master/integration/bootstrap/3
+
+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 bootstrap v3.3.1
+(storm-core/src/ui/public/js/bootstrap-3.3.1.min.js
+storm-core/src/ui/public/css/bootstrap-3.3.1.min.css)
+
+Bootstrap v3.3.1 (http://getbootstrap.com)
+Copyright 2011-2014 Twitter, Inc.
+Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+
+-----------------------------------------------------------------------
+
+For jQuery JSONFormatter 1.0.1 2015-02-28
+(storm-core/src/ui/public/js/jsonFormatter.min.js
+storm-core/src/ui/public/css/jsonFormatter.min.css)
+http://www.jqueryscript.net/other/jQuery-Plugin-For-Pretty-JSON-Formatting-jsonFormatter.htmlA
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Matthew Heironimus
+
+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.
+
http://git-wip-us.apache.org/repos/asf/storm/blob/27bc183c/storm-dist/binary/NOTICE
----------------------------------------------------------------------
diff --git a/storm-dist/binary/NOTICE b/storm-dist/binary/NOTICE
index a3e2fff..d862fab 100644
--- a/storm-dist/binary/NOTICE
+++ b/storm-dist/binary/NOTICE
@@ -1,11 +1,11 @@
Apache Storm
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
-Copyright (c) 2012-2014 Yahoo! Inc.
+Copyright (c) 2012-2015 Yahoo! Inc.
YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/).
Copyright (c) 2008-2010 Andrey Somov