Repository: falcon Updated Branches: refs/heads/master ca86057f6 -> bc9e35579
FALCON-1310 Falcon build fails with Oozie-4.2.0. Contributed by Peeyush Bishnoi Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/bc9e3557 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/bc9e3557 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/bc9e3557 Branch: refs/heads/master Commit: bc9e355796367699f2e8f5774c21a69b2ffbc217 Parents: ca86057 Author: Sowmya Ramesh <[email protected]> Authored: Wed Aug 5 16:45:26 2015 -0700 Committer: Sowmya Ramesh <[email protected]> Committed: Wed Aug 5 16:45:26 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ build-tools/src/bin/build-oozie.sh | 3 +++ build-tools/src/patches/oozie-hadoop2-profile.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/bc9e3557/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4af7786..b06e0a8 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -73,6 +73,8 @@ Trunk (Unreleased) (Suhas Vasu) BUG FIXES + FALCON-1310 Falcon build fails with Oozie-4.2.0(Peeyush Bishnoi via Sowmya Ramesh) + FALCON-1369 Trunk build is broken(Ajay Yadava via Sowmya Ramesh) FALCON-1363 Fix retry policy example in documentation(Peeyush Bishnoi via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/bc9e3557/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 5ab9092..381826b 100755 --- a/build-tools/src/bin/build-oozie.sh +++ b/build-tools/src/bin/build-oozie.sh @@ -57,6 +57,9 @@ patch -p0 < ../../build-tools/src/patches/oozie-site.patch case $VERSION in 4.1.0 ) ;; +4.2.0 ) + patch -p1 < ../../build-tools/src/patches/oozie-hadoop2-profile.patch + ;; esac rm `find . -name 'pom.xml.bak'` http://git-wip-us.apache.org/repos/asf/falcon/blob/bc9e3557/build-tools/src/patches/oozie-hadoop2-profile.patch ---------------------------------------------------------------------- diff --git a/build-tools/src/patches/oozie-hadoop2-profile.patch b/build-tools/src/patches/oozie-hadoop2-profile.patch new file mode 100644 index 0000000..c555f2d --- /dev/null +++ b/build-tools/src/patches/oozie-hadoop2-profile.patch @@ -0,0 +1,13 @@ +diff --git a/pom.xml b/pom.xml +index 455a11d..ab4299c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -1785,7 +1785,7 @@ + <profile> + <id>hadoop-2</id> + <activation> +- <activeByDefault>false</activeByDefault> ++ <activeByDefault>true</activeByDefault> + </activation> + <properties> + <hadoop.version>2.4.0</hadoop.version>
