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/13 03:02:40 UTC
[2/2] git commit: FALCON-188 hadoop-2 profile is not carried through
to oozie package. Contributed by Haohui Mai
FALCON-188 hadoop-2 profile is not carried through to oozie package. Contributed by Haohui Mai
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/2703d52c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/2703d52c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/2703d52c
Branch: refs/heads/master
Commit: 2703d52ca3291b9f99f9b4422ea5d7a418de84e0
Parents: 51c6eb2
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Nov 12 18:02:17 2013 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Nov 12 18:02:17 2013 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +
build-tools/src/bin/oozie-patch-pkg.sh | 3 +
.../src/patch/oozie-1551-hadoop-2-profile.patch | 63 ++++++++++++++++++++
build-tools/src/patch/oozie-4.0.0-falcon.patch | 12 ++--
src/bin/package.sh | 3 +
5 files changed, 78 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a54c3cd..26baa73 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -78,6 +78,9 @@ Trunk (Unreleased)
IMPROVEMENTS
+ FALCON-188 hadoop-2 profile is not carried through to
+ oozie package (Haohui Mai via Venkatesh Seetharam)
+
FALCON-159 Version API endpoint does not emit valid JSON
(Srimanth Gunturi via Venkatesh Seetharam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/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 5750ef4..8eacae5 100755
--- a/build-tools/src/bin/oozie-patch-pkg.sh
+++ b/build-tools/src/bin/oozie-patch-pkg.sh
@@ -31,7 +31,10 @@ curl -v "http://www.apache.org/dist/oozie/4.0.0/oozie-4.0.0.tar.gz" -o oozie-4.0
tar -xzvf oozie-4.0.0.tgz
cd oozie-4.0.0
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`;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch b/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
new file mode 100644
index 0000000..3a4d496
--- /dev/null
+++ b/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
@@ -0,0 +1,63 @@
+diff -urN oozie-4.0.0/hadooplibs/hadoop-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml 2013-11-12 13:06:07.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop ${project.version}</description>
+ <name>Apache Oozie Hadoop ${project.version}</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+diff -urN oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml 2013-11-12 13:06:19.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-distcp</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop Distcp ${project.version}</description>
+ <name>Apache Oozie Hadoop Distcp ${project.version}</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+diff -urN oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml 2013-11-12 13:06:30.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop ${project.version} Test</description>
+ <name>Apache Oozie Hadoop ${project.version} Test</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/build-tools/src/patch/oozie-4.0.0-falcon.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-4.0.0-falcon.patch b/build-tools/src/patch/oozie-4.0.0-falcon.patch
index 131b7fe..e5632f7 100644
--- a/build-tools/src/patch/oozie-4.0.0-falcon.patch
+++ b/build-tools/src/patch/oozie-4.0.0-falcon.patch
@@ -31,8 +31,8 @@ Index: hadooplibs/hadoop-test-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-test</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop ${project.version} Test</description>
<name>Apache Oozie Hadoop ${project.version} Test</name>
<packaging>jar</packaging>
@@ -107,8 +107,8 @@ Index: hadooplibs/hadoop-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop ${project.version}</description>
<name>Apache Oozie Hadoop ${project.version}</name>
<packaging>jar</packaging>
@@ -201,8 +201,8 @@ Index: hadooplibs/hadoop-distcp-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-distcp</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop Distcp ${project.version}</description>
<name>Apache Oozie Hadoop Distcp ${project.version}</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/src/bin/package.sh
----------------------------------------------------------------------
diff --git a/src/bin/package.sh b/src/bin/package.sh
index 417e7e6..0946e9a 100755
--- a/src/bin/package.sh
+++ b/src/bin/package.sh
@@ -54,9 +54,12 @@ curl "http://www.apache.org/dist/oozie/4.0.0/oozie-4.0.0.tar.gz" -o oozie-4.0.0.
tar -xzvf oozie-4.0.0.tgz 2> /dev/null
rm oozie-4.0.0.tgz
cd oozie-4.0.0
+
echo "Patching oozie with falcon extensions and marking version as 4.0.0 ..."
+patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-4.0.0-falcon.patch
patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-bundle-el-extension.patch
+
echo "Building oozie & creating tar ball ..."
bin/mkdistro.sh -DskipTests > /dev/null