You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2013/11/26 22:38:15 UTC
git commit: FALCON-158 Fix failing jenkins nightly build. Contributed
by Venkatesh Seetharam
Updated Branches:
refs/heads/master ea508abed -> 3825357b8
FALCON-158 Fix failing jenkins nightly build. Contributed by Venkatesh Seetharam
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/3825357b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/3825357b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/3825357b
Branch: refs/heads/master
Commit: 3825357b82a8574da65d9b001a47e56208c8be19
Parents: ea508ab
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Nov 26 13:37:55 2013 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Nov 26 13:37:55 2013 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
build-tools/src/bin/oozie-patch-pkg.sh | 17 +++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3825357b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 80e946b..74d1472 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -192,6 +192,8 @@ Release Version: 0.4-incubating
FALCON-208 Improve the icons for instance lists. (Haohui Mai)
+ FALCON-158 Fix failing jenkins nightly build. (Venkatesh Seetharam)
+
Release Version: 0.3-incubating
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/3825357b/build-tools/src/bin/oozie-patch-pkg.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/oozie-patch-pkg.sh b/build-tools/src/bin/oozie-patch-pkg.sh
index 8eacae5..fdc0392 100755
--- a/build-tools/src/bin/oozie-patch-pkg.sh
+++ b/build-tools/src/bin/oozie-patch-pkg.sh
@@ -18,7 +18,15 @@
set -e
-if [ -d `mvn help:effective-settings | grep localRepository | cut -d\> -f2 | cut -d\< -f1`/org/apache/oozie/oozie-core/4.0.0-falcon ]
+if [ -z "${MAVEN_HOME}" ]
+then
+ export MVN_CMD=`which mvn`;
+else
+ export MVN_CMD=${MAVEN_HOME}/bin/mvn;
+fi
+echo "Using maven from " $MVN_CMD
+
+if [ -d `$MVN_CMD help:effective-settings | grep localRepository | cut -d\> -f2 | cut -d\< -f1`/org/apache/oozie/oozie-core/4.0.0-falcon ]
then
echo "Oozie already setup. skipping";
exit 0;
@@ -35,13 +43,6 @@ pwd
patch -p1 < ../../build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
patch -p0 < ../../build-tools/src/patch/oozie-4.0.0-falcon.patch
-if [ -z "${MAVEN_HOME}" ]
-then
- export MVN_CMD=`which mvn`;
-else
- export MVN_CMD=${MAVEN_HOME}/bin/mvn;
-fi
-echo "Using maven from " $MVN_CMD
$MVN_CMD clean install -DskipTests
cd ..
rm -rf oozie-4.0.0*