Updated Branches: refs/heads/master 2dfff513d -> 094dbe896
BIGTOP-973. Improve error diagnostics when sed'ing Hadoop version in Oozie package Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/094dbe89 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/094dbe89 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/094dbe89 Branch: refs/heads/master Commit: 094dbe896d9113130f4e920b4304a65600a42603 Parents: 2dfff51 Author: Konstantin Boudnik <[email protected]> Authored: Tue May 7 09:50:22 2013 -0700 Committer: Konstantin Boudnik <[email protected]> Committed: Tue May 7 09:50:22 2013 -0700 ---------------------------------------------------------------------- .../src/common/oozie/do-component-build | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/094dbe89/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 7e4a3ac..6c7bdc3 100755 --- a/bigtop-packages/src/common/oozie/do-component-build +++ b/bigtop-packages/src/common/oozie/do-component-build @@ -88,10 +88,17 @@ 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#2.0.2-alpha#${HADOOP_VERSION}#" ${WORKDIR}/hadooplibs/hadoop-2/pom.xml -sed -i.orig -e "s#2.0.2-alpha#${HADOOP_VERSION}#" ${WORKDIR}/hadooplibs/hadoop-distcp-2/pom.xml -sed -i.orig -e "s#2.0.2-alpha#${HADOOP_VERSION}#" ${WORKDIR}/hadooplibs/hadoop-test-2/pom.xml -sed -i.orig -e "s#2.0.2-alpha#${HADOOP_VERSION}#" ${WORKDIR}/pom.xml +OLD_VERSION="2.0.2-alpha" +echo "Replacing old target Hadoop version ${OLD_VERSION} with ${HADOOP_VERSION}" +POM_FILES="${WORKDIR}/hadooplibs/hadoop-2/pom.xml ${WORKDIR}/hadooplibs/hadoop-distcp-2/pom.xml ${WORKDIR}/hadooplibs/hadoop-test-2/pom.xml ${WORKDIR}/pom.xml" +for pom in $POM_FILES; do + sed -i.orig -e "s#${OLD_VERSION}#${HADOOP_VERSION}#" $pom + grep ${HADOOP_VERSION} $pom 2>&1 > /dev/null + if [ $? != 0 ]; then + echo "Could not replace target hadoop version. Check if Oozie targets Hadoop $OLD_VERSION" + exit -1 + fi +done # Invoke Oozie build script ${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=${HADOOP_VERSION} ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
