Repository: bigtop Updated Branches: refs/heads/master 23a75655e -> 02baaf1d9
BIGTOP-2222 Hadoop do-component-build should pull in and use BOM Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/3614d059 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/3614d059 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/3614d059 Branch: refs/heads/master Commit: 3614d059123547df86034484881b15e7425c4dd5 Parents: 23a7565 Author: Andrew Purtell <[email protected]> Authored: Thu Jan 7 16:43:03 2016 -0800 Committer: Olaf Flebbe <[email protected]> Committed: Fri Jan 8 17:35:34 2016 +0100 ---------------------------------------------------------------------- bigtop-packages/src/common/hadoop/do-component-build | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/3614d059/bigtop-packages/src/common/hadoop/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/hadoop/do-component-build b/bigtop-packages/src/common/hadoop/do-component-build index 9f6e33a..adc2450 100644 --- a/bigtop-packages/src/common/hadoop/do-component-build +++ b/bigtop-packages/src/common/hadoop/do-component-build @@ -16,6 +16,8 @@ set -ex +. `dirname $0`/bigtop.bom + if [ -z "$BUNDLE_SNAPPY" ] ; then [ -f /usr/lib/libsnappy.so ] && BUNDLE_SNAPPY="-Dsnappy.prefix=x -Dbundle.snappy=true -Dsnappy.lib=/usr/lib" [ -f /usr/lib64/libsnappy.so ] && BUNDLE_SNAPPY="-Dsnappy.prefix=x -Dbundle.snappy=true -Dsnappy.lib=/usr/lib64" @@ -25,9 +27,10 @@ mkdir build mkdir build/src # Build artifacts -MAVEN_SKIP_TESTS="-DskipTests -DskipTest -DskipITs" -mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar ${MAVEN_SKIP_TESTS} install "$@" -mvn site site:stage ${MAVEN_SKIP_TESTS} $@ +MAVEN_OPTS="-Dzookeeper.version=$ZOOKEEPER_VERSION" +MAVEN_OPTS="$MAVEN_OPTS -DskipTests -DskipTest -DskipITs" +mvn $ANT_OPTS $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar ${MAVEN_OPTS} install "$@" +mvn site site:stage ${MAVEN_OPTS} $@ (cd build ; tar --strip-components=1 -xzvf ../hadoop-dist/target/hadoop-${HADOOP_VERSION}.tar.gz) (cd build/src ; tar --strip-components=1 -xzvf ../../hadoop-dist/target/hadoop-${HADOOP_VERSION}-src.tar.gz)
