HAWQ-1074. General LICENSE cleanup and synchronization with pom.xml

During the Apache HAWQ 2.0.0.0-incubator review (guided by Apache
project mentor Roman Shaposhnik), we identified inconsistencies with
LICENSE file.

* Moved sections covered by PostgreSQL License to appropriate section
* Add simplejson license
* Add PyYAML license
* Add sha2 license
* Remove unneeded license files covered by PostgreSQL License
* Synchronize the component order in LICENSE and pom.xml.  This helps in
  the IP review.
diff --git a/LICENSE b/LICENSE
index 20a5f42..96cb788 100644
--- a/LICENSE
+++ b/LICENSE
@@ -234,6 +234,27 @@
       licenses/LICENSE-pygresql.txt
 
 ======================================================================
+MIT License
+======================================================================
+
+  The following components are provided under a MIT license. See
+  project link for details.  The text of each license is also included
+  at licenses/LICENSE-[project].txt.
+
+     lockfile (0.9.1)
+       tools/bin/pythonSrc/lockfile-0.9.1
+       tools/bin/pythonSrc/lockfile-0.9.1/lockfile/pidlockfile.py
+
+     PSI (0.3b2_gp)
+       tools/bin/pythonSrc/PSI-0.3b2_gp
+
+     simplejson (1.7.3)
+       tools/bin/ext/simplejson
+
+     PyYAML
+       tools/bin/ext/yaml
+
+======================================================================
 BSD-style licenses
 ======================================================================
 
@@ -245,75 +266,18 @@
        depends/libyarn/CMake
        depends/libhdfs3/CMake
 
-     (BSD 4 Clause revised) dynloader
-       src/backend/port/dynloader/freebsd.c
-       src/backend/port/dynloader/netbsd.c
-       src/backend/port/dynloader/openbsd.c
-       src/backend/port/dynloader/ultrix4.h
-
-       Revised based on: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-       
-     (BSD 4 Clause revised) glob
-       src/bin/gpfdist/src/gpfdist/glob.c
-       src/bin/gpfdist/src/gpfdist/include/glob.h
-       src/include/port/win32_msvc/glob.h
-       src/port/glob.c
-
-       Revised based on: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-      
-     (BSD License) pg_controldata 
-       src/bin/pg_controldata/pg_controldata.c 
+     (BSD License) pychecker (v0.8.18 - http://pychecker.sourceforge.net/)
+       tools/bin/pythonSrc/pychecker-0.8.18 
      
      (BSD License) unittest2 (v2-0.5.1 - https://pypi.python.org/pypi/unittest2)
        tools/bin/pythonSrc/unittest2-0.5.1
      
-     (BSD License) pychecker (v0.8.18 - http://pychecker.sourceforge.net/)
-       tools/bin/pythonSrc/pychecker-0.8.18 
-     
-     (BSD License) pg8000
-       tools/bin/ext/pg8000
-      
      (BSD License) figleaf (http://darcs.idyll.org/~t/projects/figleaf/)
        tools/bin/ext/figleaf
     
-     (BSD License) port
-       src/port/inet_aton.c
-       src/port/snprintf.c
-       src/port/crypt.c
-       src/port/memcmp.c
-       src/port/strlcpy.c
-
-     (BSD License) wstrcmp
-       src/backend/utils/mb/wstrcmp.c
-
-     (BSD License) libpq-sha2
-       src/backend/libpq/sha2
-
-======================================================================
-MIT License
-======================================================================
-
-  The following components are provided under a MIT license. See
-  project link for details.  The text of each license is also included
-  at licenses/LICENSE-[project].txt.
-
-     lockfile (0.9.1)
-       tools/bin/pythonSrc/lockfile-0.9.1
-
-     PSI (0.3b2_gp)
-       tools/bin/pythonSrc/PSI-0.3b2_gp
-
-======================================================================
-Python Software Foundation (PSF) License
-======================================================================
-
-  The following components are provided under a PSF license. See
-  project link for details.  The text of each license is also included
-  at licenses/LICENSE-[project].txt.
-
-     pidlockfile
-       tools/bin/pythonSrc/lockfile-0.9.1/lockfile/pidlockfile.py
-
+     (BSD License) pg8000
+       tools/bin/ext/pg8000
+      
 ======================================================================
 BZIP2 License
 ======================================================================
@@ -364,98 +328,6 @@
       licenses/LICENSE-pexect.txt
 
 ======================================================================
-PL/Java License
-======================================================================
-
-  The following files are used:
-  
-      src/pl/pljava
-  
-  This file is made available under the following PL/Java license:
-  
-      licenses/LICENSE-pljava.txt
-
-======================================================================
-Perl Artistic License (exception)
-======================================================================
-
-  src/pl/plperl/ppport.h
-
-    Pursuant to https://issues.apache.org/jira/browse/LEGAL-79 and
-    PL/Perl's use of a generated header file, we declare this file to
-    be an exception to the Perl Artistic License.  This file is
-    derived from the PostgreSQL code base.
-
-    For completeness sake, we have provided the Perl Artistic License
-    for the Perl Devel-PPPort module
-    (http://search.cpan.org/~wolfsage/Devel-PPPort-3.32/PPPort.pm).
-    This module was used to generate the src/pl/plperl/ppport.h header
-    file. The license is available:
-
-       licenses/LICENSE-ppport.txt
-
-======================================================================
-test-ctype LICENSE
-======================================================================
-
-  The following files are used:
-  
-      src/test/locale/test-ctype.c
-  
-  This file is made available under the following test ctype license:
-  
-      licenses/LICENSE-test-ctype.txt
- 
-======================================================================
-port-rand LICENSE
-======================================================================
-
-  The following files are used:
-  
-      src/port/rand.c 
-  
-  This file is made available under the following port-rand license:
-  
-      licenses/LICENSE-port-rand.txt
-
-======================================================================
-Internet Systems Consortium/Internet Software Consortium (ISC) LICENSE
-======================================================================
-
-  The following files are used:
-  
-      src/backend/utils/adt/inet_net_ntop.c
-      src/backend/utils/adt/inet_net_pton.c 
-  
-  This file is made available under the following ISC license:
-  
-      licenses/LICENSE-isc.txt
-
-======================================================================
-regex LICENSE
-======================================================================
-
-  The following files are used:
-  
-      src/backend/regex 
-  
-  This file is made available under the following regex license:
-  
-      licenses/LICENSE-regex.txt
-
-======================================================================
-port-gettimeofday LICENSE
-======================================================================
-
-  The following files are used:
-  
-      src/port/gettimeofday.c 
-  
-  This file is made available under the following port-gettimeofday license:
-  
-      licenses/LICENSE-port-gettimeofday.txt
-
-======================================================================
 PostgreSQL LICENSE
 ======================================================================
 
@@ -471,4 +343,85 @@
      src/bin/pg_dump
      src/backend/port/qnx4/shm.c
      src/backend/port/beos/shm.c
-     
\ No newline at end of file
+
+  (BSD 4 Clause revised) dynloader
+    src/backend/port/dynloader/freebsd.c
+    src/backend/port/dynloader/netbsd.c
+    src/backend/port/dynloader/openbsd.c
+    src/backend/port/dynloader/ultrix4.h
+
+    Revised based on: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+    
+  (BSD 4 Clause revised) glob
+    src/bin/gpfdist/src/gpfdist/glob.c
+    src/bin/gpfdist/src/gpfdist/include/glob.h
+    src/include/port/win32_msvc/glob.h
+    src/port/glob.c
+
+    Revised based on: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+
+  (BSD License) pg_controldata 
+    src/bin/pg_controldata/pg_controldata.c 
+
+  (BSD License) port
+    src/port/inet_aton.c
+    src/port/snprintf.c
+    src/port/crypt.c
+    src/port/memcmp.c
+    src/port/strlcpy.c
+
+  (BSD License) wstrcmp
+    src/backend/utils/mb/wstrcmp.c
+
+  (BSD License) libpq-sha2
+    src/backend/libpq/sha2.[ch]
+
+      licenses/LICENSE-sha2.txtLICENSE-sha2.txt
+
+  (BSD License)
+   src/pl/pljava
+
+      licenses/LICENSE-pljava.txt
+
+  (Perl Artistic License) (exception)
+    src/pl/plperl/ppport.h
+  
+      Pursuant to https://issues.apache.org/jira/browse/LEGAL-79 and
+      PL/Perl's use of a generated header file, we declare this file to
+      be an exception to the Perl Artistic License.  This file is
+      derived from the PostgreSQL code base.
+  
+      For completeness sake, we have provided the Perl Artistic License
+      for the Perl Devel-PPPort module
+      (http://search.cpan.org/~wolfsage/Devel-PPPort-3.32/PPPort.pm).
+      This module was used to generate the src/pl/plperl/ppport.h header
+      file. The license is available:
+  
+         licenses/LICENSE-ppport.txt
+
+  (test-ctype LICENSE)
+    src/test/locale/test-ctype.c
+  
+      licenses/LICENSE-test-ctype.txt
+ 
+  (port-rand LICENSE)
+    src/port/rand.c 
+  
+      licenses/LICENSE-port-rand.txt
+
+  (Internet Systems Consortium/Internet Software Consortium (ISC) LICENSE)
+    
+    src/backend/utils/adt/inet_net_ntop.c
+    src/backend/utils/adt/inet_net_pton.c 
+  
+      licenses/LICENSE-isc.txt
+
+  (regex LICENSE)
+    src/backend/regex 
+  
+      licenses/LICENSE-regex.txt
+
+  (port-gettimeofday LICENSE)
+    src/port/gettimeofday.c 
+  
+      licenses/LICENSE-port-gettimeofday.txt
diff --git a/licenses/LICENSE-pg_controldata.txt b/licenses/LICENSE-pg_controldata.txt
deleted file mode 100644
index 8f6f68f..0000000
--- a/licenses/LICENSE-pg_controldata.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2001, Oliver Elphick <olly@lfix.co.uk> 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * 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 the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 <COPYRIGHT HOLDER> 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.
diff --git a/licenses/LICENSE-pitlockfile.txt b/licenses/LICENSE-pitlockfile.txt
deleted file mode 100644
index 8def309..0000000
--- a/licenses/LICENSE-pitlockfile.txt
+++ /dev/null
@@ -1,192 +0,0 @@
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
---------------------------------------------
-
-1. This LICENSE AGREEMENT is between the Python Software Foundation
-("PSF"), and the Individual or Organization ("Licensee") accessing and
-otherwise using this software ("Python") in source or binary form and
-its associated documentation.
-
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version
-prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to Python.
-
-4. PSF is making Python available to Licensee on an "AS IS"
-basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
-trademarks or trade name in a trademark sense to endorse or promote
-products or services of Licensee, or any third party.
-
-8. By copying, installing or otherwise using Python, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
--------------------------------------------
-
-BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
-
-1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization ("Licensee") accessing and otherwise using
-this software in source or binary form and its associated
-documentation ("the Software").
-
-2. Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-3. BeOpen is making the Software available to Licensee on an "AS IS"
-basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-5. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-6. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions. Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee. This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party. As an exception, the "BeOpen Python" logos available at
-http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-7. By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-
-CNRI OPEN SOURCE LICENSE AGREEMENT (for Python 1.6b1)
---------------------------------------------------
-
-IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
-
-BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING,
-INSTALLING OR OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE
-DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
-AGREEMENT.
-
-1. This LICENSE AGREEMENT is between the Corporation for National
-Research Initiatives, having an office at 1895 Preston White Drive,
-Reston, VA 20191 ("CNRI"), and the Individual or Organization
-("Licensee") accessing and otherwise using Python 1.6, beta 1
-software in source or binary form and its associated documentation,
-as released at the www.python.org Internet site on August 4, 2000
-("Python 1.6b1").
-
-2. Subject to the terms and conditions of this License Agreement, CNRI
-hereby grants Licensee a non-exclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display
-publicly, prepare derivative works, distribute, and otherwise use
-Python 1.6b1 alone or in any derivative version, provided, however,
-that CNRIs License Agreement is retained in Python 1.6b1, alone or
-in any derivative version prepared by Licensee.
-
-Alternately, in lieu of CNRIs License Agreement, Licensee may
-substitute the following text (omitting the quotes): "Python 1.6,
-beta 1, is made available subject to the terms and conditions in
-CNRIs License Agreement. This Agreement may be located on the
-Internet using the following unique, persistent identifier (known
-as a handle): 1895.22/1011. This Agreement may also be obtained
-from a proxy server on the Internet using the
-URL:http://hdl.handle.net/1895.22/1011".
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python 1.6b1 or any part thereof, and wants to make
-the derivative work available to the public as provided herein,
-then Licensee hereby agrees to indicate in any such work the nature
-of the modifications made to Python 1.6b1.
-
-4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS"
-basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
-FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6b1
-WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-
-5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
-LOSS AS A RESULT OF USING, MODIFYING OR DISTRIBUTING PYTHON 1.6b1,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY
-THEREOF.
-
-6. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-7. This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of Virginia, excluding conflict of
-law provisions. Nothing in this License Agreement shall be deemed
-to create any relationship of agency, partnership, or joint venture
-between CNRI and Licensee. This License Agreement does not grant
-permission to use CNRI trademarks or trade name in a trademark
-sense to endorse or promote products or services of Licensee, or
-any third party.
-
-8. By clicking on the "ACCEPT" button where indicated, or by copying,
-installing or otherwise using Python 1.6b1, Licensee agrees to be
-bound by the terms and conditions of this License Agreement.
-
-ACCEPT
-
-CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
---------------------------------------------------
-
-Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
-The Netherlands. All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/licenses/LICENSE-port.txt b/licenses/LICENSE-port.txt
deleted file mode 100644
index 8b201e0..0000000
--- a/licenses/LICENSE-port.txt
+++ /dev/null
@@ -1,26 +0,0 @@
- Copyright (c) 1983, 1990, 1993
-      The Regents of the University of California.  All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
diff --git a/licenses/LICENSE-sha2.txt b/licenses/LICENSE-sha2.txt
new file mode 100644
index 0000000..a2ef758
--- /dev/null
+++ b/licenses/LICENSE-sha2.txt
@@ -0,0 +1,33 @@
+/*
+ * FILE:	sha2.h
+ * AUTHOR:	Aaron D. Gifford <me@aarongifford.com>
+ *
+ * Copyright (c) 2000-2001, Aaron D. Gifford
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *	  notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name of the copyright holder nor the names of contributors
+ *	  may be used to endorse or promote products derived from this software
+ *	  without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTOR(S) ``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 AUTHOR OR CONTRIBUTOR(S) 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.
+ *
+ * $From: sha2.h,v 1.1 2001/11/08 00:02:01 adg Exp adg $
+ */
diff --git a/pom.xml b/pom.xml
index a5faf55..cfbffc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,50 +34,61 @@
           <version>0.11</version>
           <configuration>
             <excludes>
-              <!-- stream benchmark under BSD-like license with a few exceptions around benchmarking results -->
+
+              <!-- stream benchmark under BSD-like license with a few
+                   exceptions around benchmarking results -->
+
               <exclude>tools/bin/src/stream/*</exclude> 
 
-              <!-- PyGreSQL an open-source Python module that interfaces to a PostgreSQL database under the Python Software Foundation License -->
+              <!-- PyGreSQL an open-source Python module that
+                   interfaces to a PostgreSQL database under the
+                   Python Software Foundation License -->
+
               <exclude>tools/bin/pythonSrc/PyGreSQL-4.0/**</exclude>
 
               <!-- Open-source Python modules with MIT license -->
-              <exclude>tools/bin/pythonSrc/PSI-0.3b2_gp/**</exclude>
+
               <exclude>tools/bin/pythonSrc/lockfile-0.9.1/**</exclude>
+              <exclude>tools/bin/pythonSrc/PSI-0.3b2_gp/**</exclude>
               <exclude>tools/bin/ext/simplejson/**</exclude>
               <exclude>tools/bin/ext/yaml/**</exclude>
 
-              <!-- Open-source Python modules with BSD license -->
-              <exclude>tools/bin/pythonSrc/pychecker-0.8.18/**</exclude>
-              <exclude>tools/bin/pythonSrc/unittest2-0.5.1/**</exclude>
-              <exclude>tools/bin/ext/figleaf/**</exclude>
-              <exclude>tools/bin/ext/pg8000/**</exclude>
-
-              <!-- Open-source packages with Apache license -->
-              <exclude>depends/thirdparty/thrift/**</exclude>
-
               <!-- CMake BSD 3-clause license -->
 
               <exclude>depends/libhdfs3/CMake/**</exclude>
               <exclude>depends/libyarn/CMake/**</exclude>
               
-              <!-- BSD license -->
+              <!-- Open-source Python modules with BSD license -->
+              <exclude>tools/bin/pythonSrc/pychecker-0.8.18/**</exclude>
+              <exclude>tools/bin/pythonSrc/unittest2-0.5.1/**</exclude>
+              <exclude>tools/bin/ext/figleaf/**</exclude>
+              <exclude>tools/bin/ext/pg8000/**</exclude>
 
-              <exclude>depends/libhdfs3/CMake/**</exclude>
-              <exclude>depends/libyarn/CMake/**</exclude>
+              <!-- BZIP2 license (4 clause BSD) -->
+
+              <exclude>src/include/port/win32_msvc/bzlib.h</exclude>
+
+              <!-- Google license (3 clause BSD) -->
+
+              <exclude>depends/thirdparty/googletest/**</exclude>
               
+              <!-- Oraface Project BSD license
+                   https://github.com/orafce -->
+
+              <exclude>contrib/orafce/*</exclude>
+
+              <!-- Pexpect a Python module for spawning child
+                   applications and controlling them automatically,
+                   BSD license -->
+
+              <exclude>tools/bin/lib/pexpect.py</exclude>
+
+              <!-- These files came from PostgreSQL but they don't
+                   have markers to identify that -->
+
               <exclude>src/bin/gpfdist/src/gpfdist/glob.c</exclude>
               <exclude>src/bin/gpfdist/src/gpfdist/include/glob.h</exclude>
               <exclude>src/include/port/win32_msvc/glob.h</exclude>
-              <exclude>src/include/port/win32_msvc/bzlib.h</exclude>
-              <exclude>depends/thirdparty/googletest/**</exclude>
-              
-              <!-- Oraface Project BSD license https://github.com/orafce -->
-              <exclude>contrib/orafce/*</exclude>
-
-              <!-- Pexpect a Python module for spawning child applications and controlling them automatically, BSD license -->
-              <exclude>tools/bin/lib/pexpect.py</exclude>
-
-              <!-- These files came from PostgreSQL but they don't have markers to identify that -->
               <exclude>aclocal.m4</exclude>
               <exclude>GNUmakefile.in</exclude>
               <exclude>configure.in</exclude> 
@@ -117,21 +128,21 @@
               <exclude>doc/**/*.sgml</exclude>
 
               <!-- Files which are not easy to have license headers. -->
+
               <exclude>depends/libhdfs3/test/data/*</exclude>
               <exclude>depends/libhdfs3/debian/**</exclude>
 
               <!-- Following files are licensed to ASF via the initial HAWQ SGA,
                    however it is tricky to maintain headers in them -->
+
               <exclude>depends/libyarn/test/data/*</exclude>
+              <exclude>contrib/hawq-hadoop/hawq-mapreduce-common/src/test/resources/**/*.yaml</exclude>
+              <exclude>contrib/hawq-hadoop/hawq-mapreduce-tool/test-data/**/*.yaml</exclude>
 
               <exclude>contrib/hawq-hadoop/hawq-mapreduce-tool/src/test/resources/dataset</exclude>
-              <exclude>contrib/hawq-hadoop/**/*.yaml</exclude>
 
               <exclude>src/backend/access/index/caql.files</exclude>
               <exclude>src/backend/gpopt/library.ver</exclude>
-              <exclude>src/backend/libgppc/lib/Doxyfile</exclude>
-              <exclude>src/backend/libgppc/lib/package/libgppc.spec</exclude>
-              <exclude>src/backend/libgppc/lib/package/gppkg_spec.yml.source.in</exclude>
               <exclude>src/backend/utils/misc/etc/slaves</exclude>
 
               <exclude>tools/bin/.rcfile</exclude>
@@ -140,11 +151,15 @@
               <exclude>tools/demo/gpfdist_transform/*.yaml</exclude>
               <exclude>tools/bin/gppylib/operations/madlib_depcheck/changelist.yaml</exclude>
 
-              <!-- Finally we exclude a few file types (based on extension) for which comments are 
-                   tough to maintain. Note that this is a combination of files licensed to ASF and
-                   files that came from PostgreSQL and other projects (under compatible licenses).
-                   You may need to engage in software archaeology to find out the origins of these.
+              <!-- Finally we exclude a few file types (based on
+                   extension) for which comments are tough to
+                   maintain. Note that this is a combination of files
+                   licensed to ASF and files that came from PostgreSQL
+                   and other projects (under compatible licenses).
+                   You may need to engage in software archaeology to
+                   find out the origins of these.
               -->
+
               <exclude>.git/**</exclude>
               <exclude>**/*.md</exclude>
               <exclude>**/*.md5</exclude>