aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJey Kottalam <jey@cs.berkeley.edu>2013-08-14 15:36:12 -0700
committerJey Kottalam <jey@cs.berkeley.edu>2013-08-15 16:50:37 -0700
commita0f08484636395394ac2e0d22ca0ca3e1606664c (patch)
treeb95867dcaf56d8617ee17331b9e35ddc6efc1593
parenta06a9d5c5fd6584a57292a0115253e0a8a45d490 (diff)
downloadspark-a0f08484636395394ac2e0d22ca0ca3e1606664c.tar.gz
spark-a0f08484636395394ac2e0d22ca0ca3e1606664c.tar.bz2
spark-a0f08484636395394ac2e0d22ca0ca3e1606664c.zip
Update default version of Hadoop to 1.2.1
-rw-r--r--pom.xml2
-rw-r--r--project/SparkBuild.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 7e6d38df9f..135b18bd26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -540,7 +540,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>1.0.4</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ede49ea38b..350a36a964 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -170,7 +170,7 @@ object SparkBuild extends Build {
"org.apache.mesos" % "mesos" % "0.12.1",
"io.netty" % "netty-all" % "4.0.0.Beta2",
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
- "org.apache.hadoop" % "hadoop-client" % "1.0.4" excludeAll(excludeJackson, excludeNetty, excludeAsm),
+ "org.apache.hadoop" % "hadoop-client" % "1.2.1" excludeAll(excludeJackson, excludeNetty, excludeAsm),
"com.codahale.metrics" % "metrics-core" % "3.0.0",
"com.codahale.metrics" % "metrics-jvm" % "3.0.0",
"com.codahale.metrics" % "metrics-json" % "3.0.0",