Repository: spark Updated Branches: refs/heads/master 5473aa7c0 -> 668cb1def
Remove compile-scoped junit dependency. This avoids having junit classes showing up in the assembly jar. I verified that only test classes in the jtransforms package use junit. Author: Marcelo Vanzin <van...@cloudera.com> Closes #794 from vanzin/junit-dep-exclusion and squashes the following commits: 274e1c2 [Marcelo Vanzin] Remove junit from assembly in sbt build also. ad950be [Marcelo Vanzin] Remove compile-scoped junit dependency. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/668cb1de Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/668cb1de Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/668cb1de Branch: refs/heads/master Commit: 668cb1defe735add91f4a5b7b8ebe7cfd5640b25 Parents: 5473aa7 Author: Marcelo Vanzin <van...@cloudera.com> Authored: Thu Jun 5 13:13:33 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu Jun 5 13:13:33 2014 -0700 ---------------------------------------------------------------------- mllib/pom.xml | 8 ++++++++ project/SparkBuild.scala | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/668cb1de/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index 4aae202..878cb83 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -50,6 +50,14 @@ <groupId>org.scalanlp</groupId> <artifactId>breeze_${scala.binary.version}</artifactId> <version>0.7</version> + <exclusions> + <!-- This is included as a compile-scoped dependency by jtransforms, which is + a dependency of breeze. --> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.scalatest</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/668cb1de/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index efb0b93..d0049a8 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -322,6 +322,7 @@ object SparkBuild extends Build { val excludeJruby = ExclusionRule(organization = "org.jruby") val excludeThrift = ExclusionRule(organization = "org.apache.thrift") val excludeServletApi = ExclusionRule(organization = "javax.servlet", artifact = "servlet-api") + val excludeJUnit = ExclusionRule(organization = "junit") def sparkPreviousArtifact(id: String, organization: String = "org.apache.spark", version: String = "1.0.0", crossVersion: String = "2.10"): Option[sbt.ModuleID] = { @@ -466,7 +467,7 @@ object SparkBuild extends Build { previousArtifact := sparkPreviousArtifact("spark-mllib"), libraryDependencies ++= Seq( "org.jblas" % "jblas" % jblasVersion, - "org.scalanlp" %% "breeze" % "0.7" + "org.scalanlp" %% "breeze" % "0.7" excludeAll(excludeJUnit) ) )
