You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by es...@apache.org on 2016/09/21 07:02:39 UTC
[1/2] incubator-hawq git commit: HAWQ-1065. Document ppport.h license
exception.
Repository: incubator-hawq
Updated Branches:
refs/heads/2.0.0.0-incubating b7c8717bd -> dd3329147
HAWQ-1065. Document ppport.h license exception.
* Declare PL/Perl's src/pl/plperl/ppport.h source file to be an Perl
Artistic License exception.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/6e8933e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/6e8933e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/6e8933e5
Branch: refs/heads/2.0.0.0-incubating
Commit: 6e8933e5f2dab5df7259950aa20622b664d7db75
Parents: b7c8717
Author: Ed Espino <es...@apache.org>
Authored: Tue Sep 20 14:01:55 2016 -0700
Committer: Ed Espino <es...@apache.org>
Committed: Tue Sep 20 14:04:03 2016 -0700
----------------------------------------------------------------------
LICENSE | 22 +++++--
licenses/LICENSE-plperl.txt | 135 ---------------------------------------
licenses/LICENSE-ppport.txt | 135 +++++++++++++++++++++++++++++++++++++++
3 files changed, 150 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6e8933e5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 02e1967..20a5f42 100644
--- a/LICENSE
+++ b/LICENSE
@@ -376,16 +376,24 @@ PL/Java License
licenses/LICENSE-pljava.txt
======================================================================
-Perl LICENSE
+Perl Artistic License (exception)
======================================================================
- The following components are provided under a Perl Artistic
- license. See project link for details. The text of each license is
- also included at licenses/LICENSE-[project].txt.
+ 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
- plperl
- src/pl/plperl
-
======================================================================
test-ctype LICENSE
======================================================================
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6e8933e5/licenses/LICENSE-plperl.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-plperl.txt b/licenses/LICENSE-plperl.txt
deleted file mode 100644
index 4d6abf8..0000000
--- a/licenses/LICENSE-plperl.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-Version 3.x, Copyright (c) 2004-2009, Marcus Holland-Moritz.
-
-Version 2.x, Copyright (C) 2001, Paul Marquess.
-
-Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
-
-The "Artistic License"
-
-Preamble
-
-The intent of this document is to state the conditions under which a
-Package may be copied, such that the Copyright Holder maintains some
-semblance of artistic control over the development of the package,
-while giving the users of the package the right to use and distribute
-the Package in a more-or-less customary fashion, plus the right to make
-reasonable modifications.
-
-Definitions:
-
-"Package" refers to the collection of files distributed by the
-Copyright Holder, and derivatives of that collection of files
-created through textual modification.
-
-"Standard Version" refers to such a Package if it has not been
-modified, or has been modified in accordance with the wishes
-of the Copyright Holder as specified below.
-
-"Copyright Holder" is whoever is named in the copyright or
-copyrights for the package.
-
-"You" is you, if you're thinking about copying or distributing
-this Package.
-
-"Reasonable copying fee" is whatever you can justify on the
-basis of media cost, duplication charges, time of people involved,
-and so on. (You will not be required to justify it to the
- Copyright Holder, but only to the computing community at large
- as a market that must bear the fee.)
-
-"Freely Available" means that no fee is charged for the item
-itself, though there may be fees involved in handling the item.
-It also means that recipients of the item may redistribute it
-under the same conditions they received it.
-
-1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you
-duplicate all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications
-derived from the Public Domain or from the Copyright Holder. A Package
-modified in such a way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and
-when you changed that file, and provided that you do at least ONE of the
-following:
-
-a) place your modifications in the Public Domain or otherwise make them
-Freely Available, such as by posting said modifications to Usenet or
-an equivalent medium, or placing the modifications on a major archive
-site such as uunet.uu.net, or by allowing the Copyright Holder to include
-your modifications in the Standard Version of the Package.
-
-b) use the modified Package only within your corporation or organization.
-
-c) rename any non-standard executables so the names do not conflict
-with standard executables, which must also be provided, and provide
-a separate manual page for each non-standard executable that clearly
-documents how it differs from the Standard Version.
-
-d) make other distribution arrangements with the Copyright Holder.
-
-4. You may distribute the programs of this Package in object code or
-executable form, provided that you do at least ONE of the following:
-
-a) distribute a Standard Version of the executables and library files,
-together with instructions (in the manual page or equivalent) on where
-to get the Standard Version.
-
-b) accompany the distribution with the machine-readable source of
-the Package with your modifications.
-
-c) give non-standard executables non-standard names, and clearly
-document the differences in manual pages (or equivalent), together
-with instructions on where to get the Standard Version.
-
-d) make other distribution arrangements with the Copyright Holder.
-
-5. You may charge a reasonable copying fee for any distribution of this
-Package. You may charge any fee you choose for support of this
-Package. You may not charge a fee for this Package itself. However,
-you may distribute this Package in aggregate with other (possibly
-commercial) programs as part of a larger (possibly commercial) software
-distribution provided that you do not advertise this Package as a
-product of your own. You may embed this Package's interpreter within
-an executable of yours (by linking); this shall be construed as a mere
-form of aggregation, provided that the complete Standard Version of the
-interpreter is so embedded.
-
-6. The scripts and library files supplied as input to or produced as
-output from the programs of this Package do not automatically fall
-under the copyright of this Package, but belong to whoever generated
-them, and may be sold commercially, and may be aggregated with this
-Package. If such scripts or library files are aggregated with this
-Package via the so-called "undump" or "unexec" methods of producing a
-binary executable image, then distribution of such an image shall
-neither be construed as a distribution of this Package nor shall it
-fall under the restrictions of Paragraphs 3 and 4, provided that you do
-not represent such an executable image as a Standard Version of this
-Package.
-
-7. C subroutines (or comparably compiled subroutines in other
-languages) supplied by you and linked into this Package in order to
-emulate subroutines and variables of the language defined by this
-Package shall not be considered part of this Package, but are the
-equivalent of input as in Paragraph 6, provided these subroutines do
-not change the language in any way that would cause it to fail the
-regression tests for the language.
-
-8. Aggregation of this Package with a commercial distribution is always
-permitted provided that the use of this Package is embedded; that is,
-when no overt attempt is made to make this Package's interfaces visible
-to the end user of the commercial distribution. Such use shall not be
-construed as a distribution of this Package.
-
-9. The name of the Copyright Holder may not be used to endorse or promote
-products derived from this software without specific prior written permission.
-
-10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-The End
-Contact GitHub API Training Shop Blog About
-� 2016 GitHub, Inc. Terms Privacy Security Status Help
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/6e8933e5/licenses/LICENSE-ppport.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-ppport.txt b/licenses/LICENSE-ppport.txt
new file mode 100644
index 0000000..4d6abf8
--- /dev/null
+++ b/licenses/LICENSE-ppport.txt
@@ -0,0 +1,135 @@
+Version 3.x, Copyright (c) 2004-2009, Marcus Holland-Moritz.
+
+Version 2.x, Copyright (C) 2001, Paul Marquess.
+
+Version 1.x, Copyright (C) 1999, Kenneth Albanowski.
+
+The "Artistic License"
+
+Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+"Package" refers to the collection of files distributed by the
+Copyright Holder, and derivatives of that collection of files
+created through textual modification.
+
+"Standard Version" refers to such a Package if it has not been
+modified, or has been modified in accordance with the wishes
+of the Copyright Holder as specified below.
+
+"Copyright Holder" is whoever is named in the copyright or
+copyrights for the package.
+
+"You" is you, if you're thinking about copying or distributing
+this Package.
+
+"Reasonable copying fee" is whatever you can justify on the
+basis of media cost, duplication charges, time of people involved,
+and so on. (You will not be required to justify it to the
+ Copyright Holder, but only to the computing community at large
+ as a market that must bear the fee.)
+
+"Freely Available" means that no fee is charged for the item
+itself, though there may be fees involved in handling the item.
+It also means that recipients of the item may redistribute it
+under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder. A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+a) place your modifications in the Public Domain or otherwise make them
+Freely Available, such as by posting said modifications to Usenet or
+an equivalent medium, or placing the modifications on a major archive
+site such as uunet.uu.net, or by allowing the Copyright Holder to include
+your modifications in the Standard Version of the Package.
+
+b) use the modified Package only within your corporation or organization.
+
+c) rename any non-standard executables so the names do not conflict
+with standard executables, which must also be provided, and provide
+a separate manual page for each non-standard executable that clearly
+documents how it differs from the Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+a) distribute a Standard Version of the executables and library files,
+together with instructions (in the manual page or equivalent) on where
+to get the Standard Version.
+
+b) accompany the distribution with the machine-readable source of
+the Package with your modifications.
+
+c) give non-standard executables non-standard names, and clearly
+document the differences in manual pages (or equivalent), together
+with instructions on where to get the Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this
+Package. You may not charge a fee for this Package itself. However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own. You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package. If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. C subroutines (or comparably compiled subroutines in other
+languages) supplied by you and linked into this Package in order to
+emulate subroutines and variables of the language defined by this
+Package shall not be considered part of this Package, but are the
+equivalent of input as in Paragraph 6, provided these subroutines do
+not change the language in any way that would cause it to fail the
+regression tests for the language.
+
+8. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution. Such use shall not be
+construed as a distribution of this Package.
+
+9. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
+Contact GitHub API Training Shop Blog About
+� 2016 GitHub, Inc. Terms Privacy Security Status Help
[2/2] incubator-hawq git commit: HAWQ-1062. Install JSON for travis
builds.
Posted by es...@apache.org.
HAWQ-1062. Install JSON for travis builds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/dd332914
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/dd332914
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/dd332914
Branch: refs/heads/2.0.0.0-incubating
Commit: dd3329147103827235eb5ec745943009306493eb
Parents: 6e8933e
Author: Ed Espino <es...@apache.org>
Authored: Tue Sep 20 15:19:51 2016 -0700
Committer: Ed Espino <es...@apache.org>
Committed: Tue Sep 20 15:19:51 2016 -0700
----------------------------------------------------------------------
.travis.yml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/dd332914/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7e7c2aa..4891e2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ install:
libevent
python
bison
+ cpanm
- brew outdated libyaml || brew upgrade libyaml
- brew outdated json-c || brew upgrade json-c
- brew outdated boost || brew upgrade boost
@@ -28,6 +29,7 @@ install:
- brew tap brona/iproute2mac
- brew install iproute2mac
- sudo pip install pycrypto paramiko
+ - sudo cpanm install JSON
before_script:
- cd $TRAVIS_BUILD_DIR