Skip to content

Commit 85fed20

Browse files
author
Marcelo Vanzin
committed
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.
1 parent 5c107a5 commit 85fed20

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@
753753
<dependency>
754754
<groupId>junit</groupId>
755755
<artifactId>junit</artifactId>
756-
<version>4.10</version>
756+
<version>4.11</version>
757757
<scope>test</scope>
758758
</dependency>
759759
<dependency>

project/SparkBuild.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ object TestSettings {
579579
testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"),
580580
// Enable Junit testing.
581581
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
582-
libraryDependencies += "junit" % "junit" % "4.10" % "test",
583582
// Only allow one test at a time, even across projects, since they run in the same JVM
584583
parallelExecution in Test := false,
585584
// Make sure the test temp directory exists.

0 commit comments

Comments
 (0)