diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-14 08:20:13 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-04-14 08:20:13 -0700 |
| commit | ec5e553b418be43aa3f0ccc24e0d5ca9d63504b2 (patch) | |
| tree | 4440acf267cda49f299ac55e41c04f34b10f06b7 /project | |
| parent | c1c219e263cea97b3a1fdf94109b244ab1a65ea4 (diff) | |
| parent | 18bd41d1a38bdb9d68a9e6f360a15f9d7b25ebf5 (diff) | |
| download | spark-ec5e553b418be43aa3f0ccc24e0d5ca9d63504b2.tar.gz spark-ec5e553b418be43aa3f0ccc24e0d5ca9d63504b2.tar.bz2 spark-ec5e553b418be43aa3f0ccc24e0d5ca9d63504b2.zip | |
Merge pull request #558 from ash211/patch-jackson-conflict
Don't pull in old versions of Jackson via hadoop-core
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 0e55c51204..91541a34f9 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -131,7 +131,7 @@ object SparkBuild extends Build { "org.slf4j" % "slf4j-api" % slf4jVersion, "org.slf4j" % "slf4j-log4j12" % slf4jVersion, "com.ning" % "compress-lzf" % "0.8.4", - "org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION, + "org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION excludeAll( ExclusionRule(organization = "org.codehaus.jackson") ), "asm" % "asm-all" % "3.3.1", "com.google.protobuf" % "protobuf-java" % "2.4.1", "de.javakaffee" % "kryo-serializers" % "0.22", |