Repository: spark Updated Branches: refs/heads/branch-1.0 977467e51 -> c40eec844
[SPARK-1520] remove fastutil from dependencies A quick fix for https://issues.apache.org/jira/browse/SPARK-1520 By excluding fastutil, we bring the number of files in the assembly jar back under 65536, so Java 7 won't create the assembly jar in zip64 format, which cannot be read by Java 6. With this change, the assembly jar now has about 60000 entries (58000 files), tested with both sbt and maven. Author: Xiangrui Meng <[email protected]> Closes #437 from mengxr/remove-fastutil and squashes the following commits: 00f9beb [Xiangrui Meng] remove fastutil from dependencies (cherry picked from commit aa17f022c59af02b04b977da9017671ef14d664a) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c40eec84 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c40eec84 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c40eec84 Branch: refs/heads/branch-1.0 Commit: c40eec8441a7e3aff4901b6309350d015f4cf293 Parents: 977467e Author: Xiangrui Meng <[email protected]> Authored: Fri Apr 18 10:03:15 2014 -0700 Committer: Reynold Xin <[email protected]> Committed: Fri Apr 18 10:03:26 2014 -0700 ---------------------------------------------------------------------- pom.xml | 7 +++++++ project/SparkBuild.scala | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c40eec84/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cd20437..4ff18af 100644 --- a/pom.xml +++ b/pom.xml @@ -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 http://git-wip-us.apache.org/repos/asf/spark/blob/c40eec84/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 4f5a3a2..33f9d64 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
