Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@phoenix.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: elserj@apache.org
To: commits@phoenix.apache.org
Date: Thu, 21 Jul 2016 20:26:16 -0000
Message-Id: <3617a5dc20084fca9e0f01831c99b247@git.apache.org>
In-Reply-To: <7635cbca6f0942e787d19cc471c5e25c@git.apache.org>
References: <7635cbca6f0942e787d19cc471c5e25c@git.apache.org>
Subject: [24/44] phoenix git commit: PHOENIX-3089 PHOENIX-3090 Fix L&N for
 source release
archived-at: Thu, 21 Jul 2016 20:25:57 -0000

PHOENIX-3089 PHOENIX-3090 Fix L&N for source release


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/44b63f0e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/44b63f0e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/44b63f0e

Branch: refs/heads/4.x-HBase-1.0
Commit: 44b63f0e2ff911640a1fa38407b1b457e85bb668
Parents: 137e3f6
Author: Josh Elser <elserj@apache.org>
Authored: Mon Jul 18 22:57:16 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Jul 21 15:26:42 2016 -0400

----------------------------------------------------------------------
 LICENSE | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NOTICE  |  29 ++--------
 2 files changed, 179 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/44b63f0e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..5d3b58a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,177 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+---
+
+Apache Phoenix source artifact bundled components. Full licenses
+for bundled software is available at the end of this file if not
+included inline.
+
+---
+
+This product bundles the following which are licensed under the 3-clause BSD license.
+
+Sqlline (https://github.com/julianhyde/sqlline)
+
+  Copyright (c) 2002,2003,2004,2005,2006,2007 Marc Prud'hommeaux
+  Copyright (c) 2004-2010 The Eigenbase Project
+  Copyright (c) 2013-2014 Julian Hyde
+
+---
+
+This product bundles the following which are licensed under the MIT license.
+
+Portions of AngularJS (https://angularjs.org/) Copyright (c) 2010-2016 Google, Inc.
+
+Bootstrap (http://getbootstrap.com/) Copyright (c) 2011-2015 Twitter, Inc.
+  - GLYPHICONS Halflings is also included as a part of Bootstrap and falls under the same license.
+
+jQuery (https://jquery.org/) Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+
+sizzle.js (http://sizzlejs.com) Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors
+
+Angular Google Chart (https://github.com/angular-google-chart/angular-google-chart) Copyright (c) 2013 Nicolas Bouillon
+
+angular-ui-bootstrap (http://angular-ui.github.io/bootstrap/)Copyright (c) 2012-2016 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112
+
+Font Awesome CSS (http://fontawesome.io/)
+
+---
+
+This product bundles the following which are licensed under the SIL OFL 1.1 License.
+
+Font Awesome fonts (http://fontawesome.io/) 
+
+---
+
+3-Clause BSD License:
+
+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.
+
+---
+
+The MIT License:
+
+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.
+
+---
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+  redistributed and/or sold with any software provided that any reserved
+  names are not used by derivative works. The fonts and derivatives,
+  however, cannot be released under any other type of license. The
+  requirement for fonts to remain under this license does not apply
+  to any document created using the fonts or their derivatives.
+
+  DEFINITIONS
+  "Font Software" refers to the set of files released by the Copyright
+  Holder(s) under this license and clearly marked as such. This may
+  include source files, build scripts and documentation.
+
+  "Reserved Font Name" refers to any names specified as such after the
+  copyright statement(s).
+
+  "Original Version" refers to the collection of Font Software components as
+  distributed by the Copyright Holder(s).
+
+  "Modified Version" refers to any derivative made by adding to, deleting,
+  or substituting -- in part or in whole -- any of the components of the
+  Original Version, by changing formats or by porting the Font Software to a
+  new environment.
+
+  "Author" refers to any designer, engineer, programmer, technical
+  writer or other person who contributed to the Font Software.
+
+  PERMISSION & CONDITIONS
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of the Font Software, to use, study, copy, merge, embed, modify,
+  redistribute, and sell modified and unmodified copies of the Font
+  Software, subject to the following conditions:
+
+  1) Neither the Font Software nor any of its individual components,
+  in Original or Modified Versions, may be sold by itself.
+
+  2) Original or Modified Versions of the Font Software may be bundled,
+  redistributed and/or sold with any software, provided that each copy
+  contains the above copyright notice and this license. These can be
+  included either as stand-alone text files, human-readable headers or
+  in the appropriate machine-readable metadata fields within text or
+  binary files as long as those fields can be easily viewed by the user.
+
+  3) No Modified Version of the Font Software may use the Reserved Font
+  Name(s) unless explicit written permission is granted by the corresponding
+  Copyright Holder. This restriction only applies to the primary font name as
+  presented to the users.
+
+  4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+  Software shall not be used to promote, endorse or advertise any
+  Modified Version, except to acknowledge the contribution(s) of the
+  Copyright Holder(s) and the Author(s) or with their explicit written
+  permission.
+
+  5) The Font Software, modified or unmodified, in part or in whole,
+  must be distributed entirely under this license, and must not be
+  distributed under any other license. The requirement for fonts to
+  remain under this license does not apply to any document created
+  using the Font Software.
+
+  TERMINATION
+  This license becomes null and void if any of the above conditions are
+  not met.
+
+  DISCLAIMER
+  THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+  OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+  COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+  DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+  OTHER DEALINGS IN THE FONT SOFTWARE.

http://git-wip-us.apache.org/repos/asf/phoenix/blob/44b63f0e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 5418b0c..eb2eef5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,28 +1,10 @@
+Apache Phoenix
+Copyright 2013-2016 The Apache Software Foundation
+
 This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
-It includes software from other Apache Software Foundation projects,
-including, but not limited to:
-  - Apache HBase
-  - Apache Hadoop
-  - Apache Commons
-
-In addition, this product includes/uses software developed by:
-
-JLine (http://jline.sourceforge.net/),
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>.
-
-SQLLine ((http://jline.sourceforge.net/),
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>.
-
-SLF4J (http://www.slf4j.org/),
-Copyright (c) 2004-2008 QOS.ch
-
-ANTLR (http://www.antlr.org/),
-Copyright (c) 2003-2008, Terrence Parr.
-
-JUnit (http://www.junit.org/) included under the Common Public License v1.0.
-See the full text here: http://junit.sourceforge.net/cpl-v10.html
+This also includes:
 
 The phoenix-spark module has been adapted from the phoenix-spark library
 distributed under the terms of the Apache 2 license. Original source copyright:
@@ -30,8 +12,7 @@ Copyright 2014 Simply Measured, Inc.
 Copyright 2015 Interset Software Inc.
 
 The file bin/daemon.py is based on the file of the same name in python-daemon 2.0.5
-(https://pypi.python.org/pypi/python-daemon/) distributed under the terms of
-the Apache 2 license. Original source copyright:
+(https://pypi.python.org/pypi/python-daemon/). Original source copyright:
 # Copyright © 2008–2015 Ben Finney <ben+python@benfinney.id.au>
 # Copyright © 2007–2008 Robert Niederreiter, Jens Klein
 # Copyright © 2004–2005 Chad J. Schroeder