You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2014/02/04 11:05:33 UTC
git commit: FALCON-239 Build failed on build-tools due to a missing
SNAPSHOT. Contributed by Srikanth Sundarrajan
Updated Branches:
refs/heads/master 7dc8a8db7 -> 2da31c328
FALCON-239 Build failed on build-tools due to a missing SNAPSHOT. Contributed by Srikanth Sundarrajan
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/2da31c32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/2da31c32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/2da31c32
Branch: refs/heads/master
Commit: 2da31c328b85452f0998ef3346fb195985f084a0
Parents: 7dc8a8d
Author: srikanth.sundarrajan <sr...@apache.org>
Authored: Tue Feb 4 15:35:21 2014 +0530
Committer: srikanth.sundarrajan <sr...@apache.org>
Committed: Tue Feb 4 15:35:21 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +
build-tools/src/bin/build-oozie.sh | 1 +
build-tools/src/patches/OOZIE-1551-4.0.patch | 81 +++++++++++++++++++++++
3 files changed, 85 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2da31c32/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fea348f..90188d8 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,9 @@ Trunk (Unreleased)
FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
BUG FIXES
+ FALCON-239 Build failed on build-tools due to a missing SNAPSHOT. (Srikanth
+ Sundarrajan)
+
FALCON-221 Logmover is not copying all action level logs. (Srikanth Sundarrajan)
FALCON-270 Checkstyle can not be run on a module. (Jean-Baptiste Onofré via
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2da31c32/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 c0873fd..f5218dd 100755
--- a/build-tools/src/bin/build-oozie.sh
+++ b/build-tools/src/bin/build-oozie.sh
@@ -85,6 +85,7 @@ case $VERSION in
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
+ patch -p1 --verbose < ../../build-tools/src/patches/OOZIE-1551-4.0.patch
;;
esac
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2da31c32/build-tools/src/patches/OOZIE-1551-4.0.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patches/OOZIE-1551-4.0.patch b/build-tools/src/patches/OOZIE-1551-4.0.patch
new file mode 100644
index 0000000..965d475
--- /dev/null
+++ b/build-tools/src/patches/OOZIE-1551-4.0.patch
@@ -0,0 +1,81 @@
+diff --git a/hadooplibs/hadoop-2/pom.xml b/hadooplibs/hadoop-2/pom.xml
+index 83c209e..e70847e 100644
+--- a/hadooplibs/hadoop-2/pom.xml
++++ b/hadooplibs/hadoop-2/pom.xml
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</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>
+@@ -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 --git a/hadooplibs/hadoop-distcp-2/pom.xml b/hadooplibs/hadoop-distcp-2/pom.xml
+index b9948fb..d60c561 100644
+--- a/hadooplibs/hadoop-distcp-2/pom.xml
++++ b/hadooplibs/hadoop-distcp-2/pom.xml
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-distcp</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</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>
+@@ -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 --git a/hadooplibs/hadoop-test-2/pom.xml b/hadooplibs/hadoop-test-2/pom.xml
+index 499871a..3af7e9f 100644
+--- a/hadooplibs/hadoop-test-2/pom.xml
++++ b/hadooplibs/hadoop-test-2/pom.xml
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</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>
+@@ -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>
+diff --git a/pom.xml b/pom.xml
+index 73cedcf..f8fa3b4 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -1002,8 +1002,8 @@
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+- <hadoop.version>2.2.0-SNAPSHOT</hadoop.version>
+- <hadoop.auth.version>2.2.0-SNAPSHOT</hadoop.auth.version>
++ <hadoop.version>2.2.0</hadoop.version>
++ <hadoop.auth.version>2.2.0</hadoop.auth.version>
+ <pig.classifier>h2</pig.classifier>
+ <sqoop.classifier>hadoop200</sqoop.classifier>
+ </properties>