aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2014-06-05 13:13:33 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-06-05 13:13:33 -0700
commit668cb1defe735add91f4a5b7b8ebe7cfd5640b25 (patch)
tree9654d8ada4b6b6f29485e329ad4caf03527a66b4 /project
parent5473aa7c02916022430493637b1492554b48c30b (diff)
downloadspark-668cb1defe735add91f4a5b7b8ebe7cfd5640b25.tar.gz
spark-668cb1defe735add91f4a5b7b8ebe7cfd5640b25.tar.bz2
spark-668cb1defe735add91f4a5b7b8ebe7cfd5640b25.zip
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 <vanzin@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.
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index efb0b9319b..d0049a8ac4 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)
)
)