@@ -266,16 +266,17 @@ object SparkBuild extends Build {
266266 */
267267
268268 libraryDependencies ++= Seq (
269- " io.netty" % " netty-all" % " 4.0.17.Final" ,
270- " org.eclipse.jetty" % " jetty-server" % jettyVersion,
271- " org.eclipse.jetty" % " jetty-util" % jettyVersion,
272- " org.eclipse.jetty" % " jetty-plus" % jettyVersion,
273- " org.eclipse.jetty" % " jetty-security" % jettyVersion,
274- " org.scalatest" %% " scalatest" % " 2.1.5" % " test" ,
275- " org.scalacheck" %% " scalacheck" % " 1.11.3" % " test" ,
276- " com.novocode" % " junit-interface" % " 0.10" % " test" ,
277- " org.easymock" % " easymock" % " 3.1" % " test" ,
278- " org.mockito" % " mockito-all" % " 1.8.5" % " test"
269+ " io.netty" % " netty-all" % " 4.0.17.Final" ,
270+ " org.eclipse.jetty" % " jetty-server" % jettyVersion,
271+ " org.eclipse.jetty" % " jetty-util" % jettyVersion,
272+ " org.eclipse.jetty" % " jetty-plus" % jettyVersion,
273+ " org.eclipse.jetty" % " jetty-security" % jettyVersion,
274+ " org.scalatest" %% " scalatest" % " 2.1.5" % " test" ,
275+ " org.scalacheck" %% " scalacheck" % " 1.11.3" % " test" ,
276+ " com.novocode" % " junit-interface" % " 0.10" % " test" ,
277+ " org.easymock" % " easymockclassextension" % " 3.1" % " test" ,
278+ " org.mockito" % " mockito-all" % " 1.9.0" % " test" ,
279+ " junit" % " junit" % " 4.10" % " test"
279280 ),
280281
281282 testOptions += Tests .Argument (TestFrameworks .JUnit , " -v" , " -a" ),
@@ -316,6 +317,7 @@ object SparkBuild extends Build {
316317 val excludeFastutil = ExclusionRule (organization = " it.unimi.dsi" )
317318 val excludeJruby = ExclusionRule (organization = " org.jruby" )
318319 val excludeThrift = ExclusionRule (organization = " org.apache.thrift" )
320+ val excludeJunit = ExclusionRule (organization = " junit" )
319321
320322 def sparkPreviousArtifact (id : String , organization : String = " org.apache.spark" ,
321323 version : String = " 0.9.0-incubating" , crossVersion : String = " 2.10" ): Option [sbt.ModuleID ] = {
@@ -458,7 +460,7 @@ object SparkBuild extends Build {
458460 previousArtifact := sparkPreviousArtifact(" spark-mllib" ),
459461 libraryDependencies ++= Seq (
460462 " org.jblas" % " jblas" % jblasVersion,
461- " org.scalanlp" %% " breeze" % " 0.7"
463+ " org.scalanlp" %% " breeze" % " 0.7" excludeAll(excludeJunit)
462464 )
463465 )
464466
@@ -469,7 +471,6 @@ object SparkBuild extends Build {
469471 // this non-deterministically. TODO: FIX THIS.
470472 parallelExecution in Test := false ,
471473 libraryDependencies ++= Seq (
472- " org.scalatest" %% " scalatest" % " 1.9.1" % " test" ,
473474 " com.typesafe" %% " scalalogging-slf4j" % " 1.0.1"
474475 )
475476 )
0 commit comments