Repository: spark
Updated Branches:
  refs/heads/master af7f2f109 -> c8c59b326


[SPARK-1232] Fix the hadoop 0.23 yarn build

Author: Thomas Graves <tgra...@apache.org>

Closes #127 from tgravescs/SPARK-1232 and squashes the following commits:

c05cfd4 [Thomas Graves] Fix the hadoop 0.23 yarn build


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c8c59b32
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c8c59b32
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c8c59b32

Branch: refs/heads/master
Commit: c8c59b326e587b7515ba4f43399c67d949df244f
Parents: af7f2f1
Author: Thomas Graves <tgra...@apache.org>
Authored: Wed Mar 12 10:32:01 2014 -0700
Committer: Patrick Wendell <pwend...@gmail.com>
Committed: Wed Mar 12 10:32:01 2014 -0700

----------------------------------------------------------------------
 core/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/c8c59b32/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2248f9d..a6f478b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -30,6 +30,18 @@
   <packaging>jar</packaging>
   <name>Spark Project Core</name>
   <url>http://spark.apache.org/</url>
+  <!-- SPARK-1121: Adds an explicit dependency on Avro to work around a Hadoop 
0.23.X issue -->
+  <profiles>
+    <profile>
+      <id>yarn-alpha</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 
   <dependencies>
     <dependency>

Reply via email to