diff options
| -rw-r--r-- | pom.xml | 7 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -263,6 +263,13 @@ <groupId>com.clearspring.analytics</groupId> <artifactId>stream</artifactId> <version>2.5.1</version> + <exclusions> + <!-- Only HyperLogLog is used, which doesn't depend on fastutil --> + <exclusion> + <groupId>it.unimi.dsi</groupId> + <artifactId>fastutil</artifactId> + </exclusion> + </exclusions> </dependency> <!-- In theory we need not directly depend on protobuf since Spark does not directly use it. However, when building with Hadoop/YARN 2.2 Maven doesn't correctly bump diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 4f5a3a224f..33f9d644ca 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -304,7 +304,7 @@ object SparkBuild extends Build { val excludeHadoop = ExclusionRule(organization = "org.apache.hadoop") val excludeCurator = ExclusionRule(organization = "org.apache.curator") val excludePowermock = ExclusionRule(organization = "org.powermock") - + val excludeFastutil = ExclusionRule(organization = "it.unimi.dsi") def sparkPreviousArtifact(id: String, organization: String = "org.apache.spark", version: String = "0.9.0-incubating", crossVersion: String = "2.10"): Option[sbt.ModuleID] = { @@ -343,7 +343,7 @@ object SparkBuild extends Build { "com.twitter" %% "chill" % chillVersion excludeAll(excludeAsm), "com.twitter" % "chill-java" % chillVersion excludeAll(excludeAsm), "org.tachyonproject" % "tachyon" % "0.4.1-thrift" excludeAll(excludeHadoop, excludeCurator, excludeEclipseJetty, excludePowermock), - "com.clearspring.analytics" % "stream" % "2.5.1", + "com.clearspring.analytics" % "stream" % "2.5.1" excludeAll(excludeFastutil), "org.spark-project" % "pyrolite" % "2.0" ), libraryDependencies ++= maybeAvro |