diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-09-11 10:21:48 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-09-11 10:21:48 -0700 |
| commit | 91a59e6b104523112d52d05a90a8fe6bc988161a (patch) | |
| tree | 650671ed8f09c867ef8d2a792ca1729a220df22a | |
| parent | b9128d34bfcd44692bcae5771a17800fed0d4bf4 (diff) | |
| parent | f117dc6d0d1349c28b7e1c8cf7729d1aafde5d25 (diff) | |
| download | spark-91a59e6b104523112d52d05a90a8fe6bc988161a.tar.gz spark-91a59e6b104523112d52d05a90a8fe6bc988161a.tar.bz2 spark-91a59e6b104523112d52d05a90a8fe6bc988161a.zip | |
Merge pull request #919 from mateiz/jets3t
Add explicit jets3t dependency, which is excluded in hadoop-client
| -rw-r--r-- | core/pom.xml | 5 | ||||
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/core/pom.xml b/core/pom.xml index b5c5194524..14cd520aaf 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -37,6 +37,11 @@ <artifactId>hadoop-client</artifactId> </dependency> <dependency> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + <version>0.7.1</version> + </dependency> + <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> @@ -374,6 +374,11 @@ </exclusions> </dependency> <dependency> + <groupId>net.java.dev.jets3t</groupId> + <artifactId>jets3t</artifactId> + <version>0.7.1</version> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> <version>${hadoop.version}</version> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 0736ec3ab7..77e211ce03 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -208,6 +208,7 @@ 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), + "net.java.dev.jets3t" % "jets3t" % "0.7.1", "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", |