From 85fed2051574c7628c5d80cea4822e53e535bde8 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Wed, 26 Aug 2015 11:06:22 -0700
Subject: [PATCH] Use same junit version for maven and sbt.

This makes sbt happy now that I put the junit assembly
in the shared dependencies in the root pom.
---
 pom.xml                  | 2 +-
 project/SparkBuild.scala | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fdb0a3f4705a2..a40fc66ff89e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -753,7 +753,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.10</version>
+        <version>4.11</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 65f181701f51b..db7054a8f741b 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -579,7 +579,6 @@ object TestSettings {
     testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
     // Enable Junit testing.
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
-    libraryDependencies += "junit" % "junit" % "4.10" % "test",
     // Only allow one test at a time, even across projects, since they run in the same JVM
     parallelExecution in Test := false,
     // Make sure the test temp directory exists.