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 2014/05/01 22:43:00 UTC
[2/3] git commit: FALCON-386 Upgrade to oozie 4.0.1. Contributed by
Sowmya Ramesh
FALCON-386 Upgrade to oozie 4.0.1. Contributed by Sowmya Ramesh
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/cb476052
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/cb476052
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/cb476052
Branch: refs/heads/master
Commit: cb476052806799de069c5f8065a61f46213098c2
Parents: d41a735
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Thu May 1 13:03:27 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Thu May 1 13:03:27 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
build-tools/src/bin/build-oozie.sh | 17 +++++------------
pom.xml | 2 +-
3 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cb476052/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index db3633c..61f1766 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,8 @@ Trunk (Unreleased)
Venkatesh Seetharam)
IMPROVEMENTS
+ FALCON-386 Upgrade to oozie 4.0.1. (Sowmya Ramesh via Venkatesh Seetharam)
+
FALCON-392 HCat Example Recipes. (Shwetha GS via Venkatesh Seetharam)
FALCON-391 Add ability to set mapBandwidth. (Michael Miklavcic via Shwetha GS)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cb476052/build-tools/src/bin/build-oozie.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/build-oozie.sh b/build-tools/src/bin/build-oozie.sh
index ee3a633..625613c 100755
--- a/build-tools/src/bin/build-oozie.sh
+++ b/build-tools/src/bin/build-oozie.sh
@@ -56,35 +56,28 @@ tar -xzvf oozie-$VERSION.tgz
rm oozie-$VERSION.tgz
cd $PKG
+sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
+patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+
case $VERSION in
3.2.0-incubating )
- sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
- patch -p0 < ../../build-tools/src/patches/oozie-site.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-882.patch
;;
3.3.0 )
- sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
- patch -p0 < ../../build-tools/src/patches/oozie-site.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
;;
3.3.1 )
- sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
- patch -p0 < ../../build-tools/src/patches/oozie-site.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6-3.2.0.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-1465.patch
;;
3.3.2 )
- sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
- patch -p0 < ../../build-tools/src/patches/oozie-site.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-674-v6.patch
patch -p0 < ../../build-tools/src/patches/OOZIE-1465-3.3.2.patch
;;
-4* )
- sed -i.bak s/$VERSION\<\\/version\>/$BUILD_VERSION\<\\/version\>/g pom.xml */pom.xml */*/pom.xml
- patch -p0 < ../../build-tools/src/patches/oozie-site.patch
+4.0.0 )
patch -p1 --verbose < ../../build-tools/src/patches/OOZIE-1551-4.0.patch
;;
esac
@@ -93,4 +86,4 @@ rm `find . -name 'pom.xml.bak'`
$MVN_CMD clean install -DskipTests
-popd
+popd
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/cb476052/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2872d4a..1fd36d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
<include.prism>true</include.prism>
<slf4j.version>1.6.1</slf4j.version>
- <oozie.version>4.0.0</oozie.version>
+ <oozie.version>4.0.1</oozie.version>
<oozie.buildversion>${oozie.version}-falcon</oozie.buildversion>
<oozie.forcebuild>false</oozie.forcebuild>
<activemq.version>5.4.3</activemq.version>