HAWQ-707. Update LICENSE & .travis.yml

Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/03a3e206
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/03a3e206
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/03a3e206

Branch: refs/heads/master
Commit: 03a3e2069791ad18fbe90aaf350f37c07206e133
Parents: a5b68ba
Author: xunzhang <[email protected]>
Authored: Wed Apr 27 07:54:58 2016 +0800
Committer: Ruilong Huo <[email protected]>
Committed: Mon May 9 18:05:37 2016 +0800

----------------------------------------------------------------------
 .travis.yml | 12 +++++++-----
 LICENSE     | 41 +----------------------------------------
 2 files changed, 8 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/03a3e206/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 31c8525..2e6b838 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,16 +38,18 @@ install:
   - brew uninstall postgresql
 
 before_script:
-  - wget -O "/tmp/libhdfs3" 
"https://github.com/Pivotal-DataFabric/libhdfs3/archive/apache-rpc-9.zip";
-  - unzip -d "/tmp" "/tmp/libhdfs3"
-  - cd "/tmp/libhdfs3-apache-rpc-9"
+  - cd $TRAVIS_BUILD_DIR/depends/thirdparty/googletest
+  - mkdir build
+  - cd build
+  - cmake ..
+  - make -j2
+  - sudo make install
+  - cd $TRAVIS_BUILD_DIR/depends/libhdfs3
   - mkdir build
   - cd build
   - ../bootstrap --prefix=/usr/local/
   - make -j2
   - sudo make install
-  - cd /tmp && rm -rf /tmp/libhdfs3*
-  - cd $TRAVIS_BUILD_DIR
   - cd $TRAVIS_BUILD_DIR/depends/libyarn
   - mkdir build
   - cd build

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/03a3e206/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 58e16f3..2f5b242 100644
--- a/LICENSE
+++ b/LICENSE
@@ -411,46 +411,7 @@ Julian Seward, [email protected]
 bzip2/libbzip2 version 1.0.6 of 6 September 2010
 
 ***********************************************************************
-Source code under
-  depends/libyarn/gmock
-  depends/libhdfs3/gmock
-is taken from googlemock
-and is available under the following license:
-
-Copyright 2008, Google Inc.
-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 Google Inc. 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 THE COPYRIGHT
-OWNER 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.
-
-***********************************************************************
-Source code under
-  depends/libyarn/gtest
-  depends/libhdfs3/gtest
-is taken from googletest
+Source code under depends/thirdparty/googletest is taken from googletest
 and is available under the following license:
 
 Copyright 2008, Google Inc.

Reply via email to