You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2016/01/11 06:53:57 UTC

bigtop git commit: BIGTOP-1022. Giraph build script should also specify ZooKeeper, HBase, and Hive versions

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 <rv...@apache.org>
Authored: Mon Jan 11 05:30:40 2016 +0000
Committer: Roman Shaposhnik <rv...@apache.org>
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