From ad950beb3d62a4155c1b1546ad5b0d57595d504d Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 15 May 2014 11:35:29 -0700 Subject: [PATCH 1/2] 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. --- mllib/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mllib/pom.xml b/mllib/pom.xml index cdd33dbb7970..067f57f86da2 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -50,6 +50,14 @@ org.scalanlp breeze_${scala.binary.version} 0.7 + + + + junit + junit + + org.scalatest From 274e1c2ddee02e93d8f838363998a6664b762ef3 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 15 May 2014 17:45:28 -0700 Subject: [PATCH 2/2] Remove junit from assembly in sbt build also. --- project/SparkBuild.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index efb0b9319be1..d0049a8ac43a 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) ) )