diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-19 12:33:13 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-19 12:33:13 -0700 |
| commit | 6f6944c8079bffdd088ddb0a84fbf83356e294ea (patch) | |
| tree | 8ed56ab99241f56dc06450e6afda3cf5182edd95 /project | |
| parent | 23f4622affc25685bb74ce09ed56ef3515551d17 (diff) | |
| download | spark-6f6944c8079bffdd088ddb0a84fbf83356e294ea.tar.gz spark-6f6944c8079bffdd088ddb0a84fbf83356e294ea.tar.bz2 spark-6f6944c8079bffdd088ddb0a84fbf83356e294ea.zip | |
Update SBT build to use simpler fix for Hadoop 0.23.9
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index cea982b886..282b0cbed5 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -190,22 +190,13 @@ object SparkBuild extends Build { "io.netty" % "netty-all" % "4.0.0.Beta2", "org.apache.derby" % "derby" % "10.4.2.0" % "test", "org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), + "org.apache.avro" % "avro" % "1.7.4", + "org.apache.avro" % "avro-ipc" % "1.7.4" excludeAll(excludeNetty), "com.codahale.metrics" % "metrics-core" % "3.0.0", "com.codahale.metrics" % "metrics-jvm" % "3.0.0", "com.codahale.metrics" % "metrics-json" % "3.0.0", "com.twitter" % "chill_2.9.3" % "0.3.1", "com.twitter" % "chill-java" % "0.3.1" - ) ++ ( - if (isYarnMode) { - // This kludge is needed for 0.23.x - Seq( - "org.apache.hadoop" % "hadoop-yarn-api" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), - "org.apache.hadoop" % "hadoop-yarn-common" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm), - "org.apache.hadoop" % "hadoop-yarn-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm) - ) - } else { - Seq() - } ) ) ++ assemblySettings ++ extraAssemblySettings |