diff --git a/bagel/pom.xml b/bagel/pom.xml
index 355f437c5b16a4a0e86f12cdb147ac4d9aff17ac..41aacbd88a7d7ed2722ed8d1e43170baf90bda59 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project Bagel</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 2afd25082534e41a1f17880403098ec98aaa7499..99c841472b3eb9bcd41e79e704d2fc409a17655f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project Core</name>
<url>http://spark.apache.org/</url>
+ <!-- SPARK-1121: 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>
<groupId>org.apache.hadoop</groupId>
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index 40cac8eb4f0db65967afe0e44c3f393f2599413b..ded12926885b94fcbd44ff0e491dc8f42c542b32 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -76,7 +76,3 @@ The maven build includes support for building a Debian package containing the as
$ mvn -Pdeb -DskipTests clean package
The debian package can then be found under assembly/target. We added the short commit hash to the file name so that we can distinguish individual packages built for SNAPSHOT versions.
-
-## A note about Hadoop version 0.23.x
-
-For building spark with hadoop 0.23.x and also yarn, you will have to manually add a dependency on avro (org.apache.avro, avro, 1.7.4).
diff --git a/examples/pom.xml b/examples/pom.xml
index d952e2ca4e5dc5f964d40f29d56f13e214761903..3aba343f4cf5075a96468a6e3fa60c1283526f36 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project Examples</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<repositories>
<repository>
<id>apache-repo</id>
diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index bc00ab4573c39a4ca86c05069c62b927740c8f42..8783aea3e4a5b7a2e637666a5c3d85342fe40fb4 100644
--- a/external/flume/pom.xml
+++ b/external/flume/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project External Flume</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index 979eb0ca624bd2be6415a535ab6e005915723844..79dc38f9844a095dd4f2cfaf5d18b5c37734e4d6 100644
--- a/external/kafka/pom.xml
+++ b/external/kafka/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project External Kafka</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index 2c476b402e83deec730aa488ec8f10cd0fd89dd1..06c751df7f9c878af0c58d3d8dc43fc1b3667788 100644
--- a/external/mqtt/pom.xml
+++ b/external/mqtt/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project External MQTT</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<repositories>
<repository>
<id>mqtt-repo</id>
diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml
index a443459594710c9578fe0d012944b7404310738d..37bb4fad64f68df2906a5ef39b03707e04dba746 100644
--- a/external/twitter/pom.xml
+++ b/external/twitter/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project External Twitter</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml
index a40e55876e64073d9e4db8900da671af3abdb27d..65ec0e26da881afe410045b82ac9ae7a99c25c19 100644
--- a/external/zeromq/pom.xml
+++ b/external/zeromq/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project External ZeroMQ</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 2b4d674221b18b571ccd6b091c028bfd443bb595..5b54dd27efb445984793da022c3d4139121057d0 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project GraphX</name>
<url>http://spark-project.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index c0e745dadb22ccc07c87c4f3415dbaa6732d6fa2..760a2a85d5ffaa050679efb329d129147137f648 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project ML Library</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/pom.xml b/pom.xml
index 7e04efaa9cefc1c8005f9e547524d7261124502a..7e28d7c1941bb75f955cc9bc63d6aaa9291ef5b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,6 +425,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>1.7.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
diff --git a/repl/pom.xml b/repl/pom.xml
index 3a6baf5c42f6a65b168cbb22e420872cb15df974..aa01a1760285a37e7f18078f8ceecd0e99e9e7d1 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project REPL</name>
<url>http://spark.apache.org/</url>
+ <!-- SPARK-1121: 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>
+
<properties>
<deb.install.path>/usr/share/spark</deb.install.path>
<deb.user>root</deb.user>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 1f3366e25f6a908a0db123a02d033486f855a6bb..91d6a1375a18c1715fb1ca8f493d393334362659 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -31,6 +31,20 @@
<name>Spark Project Streaming</name>
<url>http://spark.apache.org/</url>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<repositories>
<repository>
<id>apache-repo</id>
diff --git a/tools/pom.xml b/tools/pom.xml
index 67f2d780f312ecf19d8219ce6a60a76ca99c18cb..b8dd255d40ac43e499c1134685222d0a0610c934 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -30,6 +30,20 @@
<name>Spark Project Tools</name>
<url>http://spark.apache.org/</url>
+ <!-- SPARK-1121: 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>
<groupId>org.apache.spark</groupId>
diff --git a/yarn/alpha/pom.xml b/yarn/alpha/pom.xml
index e076ca1d44b975663dd2bd7c34ad9956a5ee029a..bfe12ecec0c09e6e04cd863322c07fb3e9a1af5e 100644
--- a/yarn/alpha/pom.xml
+++ b/yarn/alpha/pom.xml
@@ -24,6 +24,20 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<groupId>org.apache.spark</groupId>
<artifactId>spark-yarn-alpha_2.10</artifactId>
<packaging>jar</packaging>
diff --git a/yarn/pom.xml b/yarn/pom.xml
index be51679292933914f9d31b2d3b43d41fdaccf8f4..35e31760c1f02c40459b9874a09a4135a8adcd74 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -52,14 +52,6 @@
<artifactId>hadoop-client</artifactId>
<version>${yarn.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-ipc</artifactId>
- </dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
@@ -78,6 +70,15 @@
<modules>
<module>alpha</module>
</modules>
+
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
</profile>
<profile>
diff --git a/yarn/stable/pom.xml b/yarn/stable/pom.xml
index 0780f251b595ce7f3f2fd8a61a62557071f2ed4e..9d68603251d1c23d5a3b6fbd20efb41897ae11d9 100644
--- a/yarn/stable/pom.xml
+++ b/yarn/stable/pom.xml
@@ -24,6 +24,20 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <profiles>
+ <profile>
+ <!-- SPARK-1121: SPARK-1121: Adds an explicit dependency on Avro to work around
+ a Hadoop 0.23.X issue -->
+ <id>yarn-alpha</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<groupId>org.apache.spark</groupId>
<artifactId>spark-yarn_2.10</artifactId>
<packaging>jar</packaging>