falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject git commit: FALCON-158 Fix failing jenkins nightly build. Contributed by Venkatesh Seetharam
Date Tue, 26 Nov 2013 21:41:02 GMT
Updated Branches:
  refs/heads/branch-0.4 07e086a9a -> fb532941d


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/fb532941
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/fb532941
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/fb532941

Branch: refs/heads/branch-0.4
Commit: fb532941d489c5d430100e4ebe331624c6b4e3ce
Parents: 07e086a
Author: Venkatesh Seetharam <venkatesh@apache.org>
Authored: Tue Nov 26 13:40:55 2013 -0800
Committer: Venkatesh Seetharam <venkatesh@apache.org>
Committed: Tue Nov 26 13:40: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/fb532941/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/fb532941/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*


Mime
View raw message