You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2013/04/07 02:41:06 UTC
git commit: BIGTOP-909. backport bigtop-837 to 0.3.1
Updated Branches:
refs/heads/branch-0.3.1 a806283de -> 57bf15b39
BIGTOP-909. backport bigtop-837 to 0.3.1
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/57bf15b3
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/57bf15b3
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/57bf15b3
Branch: refs/heads/branch-0.3.1
Commit: 57bf15b39463a385c2099e00ae244ee013820935
Parents: a806283
Author: Konstantin Boudnik <co...@apache.org>
Authored: Sat Apr 6 17:40:24 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Sat Apr 6 17:40:24 2013 -0700
----------------------------------------------------------------------
.../src/common/oozie/do-component-build | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/57bf15b3/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index a725b23..52446c4 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -18,6 +18,7 @@ set -x
#
# Resolve source directory
#
+. `dirname ${0}`/bigtop.bom
# $0 may be a softlink
PRG="$0"
@@ -36,11 +37,6 @@ RELEASE_DIR=`cd ${RELEASE_DIR}/..;pwd`
RELEASE_DIR=$PWD
-#
-# Resolve build version
-#
-OOZIE_VERSION=3.1.3-incubating
-
# IMPORTANT: THE FULL_VERSION, if set, will be used only for the final TARBALL,
# Everything inside of the TARBALL uses the version specified in the POM
if [ -z "${FULL_VERSION}" ]; then
@@ -79,8 +75,14 @@ if [ "${DO_MAVEN_DEPLOY}" = "deploy" ]; then
EXTRA_GOALS="${EXTRA_GOALS} source:jar deploy"
fi
+## Update hardcoded version of the Hadoop base to the current HADOOP VERSION
+## This approach might need to be reconsidered once OOZIE-1201 is fixed
+sed -i.orig -e "s#1.0.1#${HADOOP_VERSION}#" ${WORKDIR}/hadooplibs/hadoop-1_0_1/pom.xml
+sed -i.orig -e "s#1.0.1#${HADOOP_VERSION}#" ${WORKDIR}/hadooplibs/hadoop-test-1_0_1/pom.xml
+sed -i.orig -e "s#1.0.1#${HADOOP_VERSION}#" ${WORKDIR}/pom.xml
+
# Invoke Oozie build script with CDH options
-${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=1.0.0 ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
+${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=${HADOOP_VERSION} ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
if [ "${MKDISTRO_RESULT}" != "0" ]; then
echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"