Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Review feedback on PR

  • Loading branch information...
commit 9b29e3472ee1f8954e00c61a4abd8560bf785e90 1 parent 46ed2ad
@ScrapCodes ScrapCodes authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  docs/building-with-maven.md
  2. +3 −3 project/SparkBuild.scala
View
2  docs/building-with-maven.md
@@ -79,4 +79,4 @@ The debian package can then be found under assembly/target. We added the short c
## A note about Hadoop version 0.23.x
-For building spark with hadoop 0.23.x and also yarn, you will have to provide a dependency on avro manually.
+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).
View
6 project/SparkBuild.scala
@@ -87,7 +87,7 @@ object SparkBuild extends Build {
case Some(v) => v.toBoolean
}
lazy val hadoopClient = if (hadoopVersion.startsWith("0.20.") || hadoopVersion == "1.0.0") "hadoop-core" else "hadoop-client"
- val isAvroNeeded = hadoopVersion.startsWith("0.23.") && isYarnEnabled
+ val maybeAvro = if (hadoopVersion.startsWith("0.23.") && isYarnEnabled) Seq("org.apache.avro" % "avro" % "1.7.4") else Seq()
// Conditionally include the yarn sub-project
lazy val yarnAlpha = Project("yarn-alpha", file("yarn/alpha"), settings = yarnAlphaSettings) dependsOn(core)
lazy val yarn = Project("yarn", file("yarn/stable"), settings = yarnSettings) dependsOn(core)
@@ -286,8 +286,8 @@ object SparkBuild extends Build {
"com.twitter" %% "chill" % "0.3.1",
"com.twitter" % "chill-java" % "0.3.1",
"com.clearspring.analytics" % "stream" % "2.5.1"
- ) ++ (if (isAvroNeeded) Seq(
- "org.apache.avro" % "avro" % "1.7.4") else Seq())
+ ),
+ libraryDependencies ++= maybeAvro
)
def rootSettings = sharedSettings ++ Seq(
Please sign in to comment.
Something went wrong with that request. Please try again.