Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E9ED318D1F for ; Mon, 11 Jan 2016 05:53:57 +0000 (UTC) Received: (qmail 25715 invoked by uid 500); 11 Jan 2016 05:53:57 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 25682 invoked by uid 500); 11 Jan 2016 05:53:57 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 25673 invoked by uid 99); 11 Jan 2016 05:53:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Jan 2016 05:53:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADB1ADFE65; Mon, 11 Jan 2016 05:53:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rvs@apache.org To: commits@bigtop.apache.org Message-Id: <3f90e7f5ca834f88836dda9c0103838b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: bigtop git commit: BIGTOP-1022. Giraph build script should also specify ZooKeeper, HBase, and Hive versions Date: Mon, 11 Jan 2016 05:53:57 +0000 (UTC) Repository: bigtop Updated Branches: refs/heads/master d0e356733 -> 6c9829e8b BIGTOP-1022. Giraph build script should also specify ZooKeeper, HBase, and Hive versions Plus temporarily disabling site packaging while upstream Giraph is sorting out build issues GIRAPH-1042 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6c9829e8 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6c9829e8 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6c9829e8 Branch: refs/heads/master Commit: 6c9829e8bc3f8971b146c10f6d9df589db43c52a Parents: d0e3567 Author: Roman V Shaposhnik Authored: Mon Jan 11 05:30:40 2016 +0000 Committer: Roman Shaposhnik Committed: Sun Jan 10 21:53:17 2016 -0800 ---------------------------------------------------------------------- bigtop-packages/src/common/giraph/do-component-build | 6 +++--- bigtop-packages/src/common/giraph/install_giraph.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c9829e8/bigtop-packages/src/common/giraph/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/giraph/do-component-build b/bigtop-packages/src/common/giraph/do-component-build index 9ee5d34..ac53bbd 100644 --- a/bigtop-packages/src/common/giraph/do-component-build +++ b/bigtop-packages/src/common/giraph/do-component-build @@ -18,8 +18,8 @@ set -ex . `dirname $0`/bigtop.bom -BULK_MVN_OPTS="-Phadoop_2 -DskipTests -Dhadoop.version=$HADOOP_VERSION $@" +BULK_MVN_OPTS="-Phadoop_2 -DskipTests -Dhadoop.version=$HADOOP_VERSION -Dzookeeper.version=$ZOOKEEPER_VERSION -Dhbase.version=$HBASE_VERSION -Dhive.version=$HIVE_VERSION $@" mvn $BULK_MVN_OPTS clean install -mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:site -mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:stage +# mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:site +# mvn $BULK_MVN_OPTS -Ddependency.locations.enabled=false site:stage http://git-wip-us.apache.org/repos/asf/bigtop/blob/6c9829e8/bigtop-packages/src/common/giraph/install_giraph.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/giraph/install_giraph.sh b/bigtop-packages/src/common/giraph/install_giraph.sh index f76959b..5b2ae12 100644 --- a/bigtop-packages/src/common/giraph/install_giraph.sh +++ b/bigtop-packages/src/common/giraph/install_giraph.sh @@ -113,7 +113,7 @@ cp -r $BUILD_DIR/giraph-dist/target/giraph*-bin/*/* ${PREFIX}/${LIB_DIR} # Installing docs and examples install -d -m 0755 $PREFIX/${DOC_DIR} -cp -r $BUILD_DIR/target/staging/* $PREFIX/${DOC_DIR} +# cp -r $BUILD_DIR/target/staging/* $PREFIX/${DOC_DIR} mv ${PREFIX}/${LIB_DIR}/giraph-examples*.jar $PREFIX/${DOC_DIR} # Install executable wrappers