Merge pull request #65 from benmccann/junit-4.12

jsuereth · jsuereth · commit e5bffdf51846 · 2015-01-15T12:05:42.000-05:00
Upgrade to junit 4.12
diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ version := "0.11"
 
 crossPaths := false
 
-libraryDependencies += "junit" % "junit" % "4.11"
+libraryDependencies += "junit" % "junit" % "4.12"
 
 libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
 
diff --git a/src/main/java/com/novocode/junit/CategoryFilter.java b/src/main/java/com/novocode/junit/CategoryFilter.java
diff --git a/src/main/java/com/novocode/junit/JUnitRunner.java b/src/main/java/com/novocode/junit/JUnitRunner.java
@@ -5,6 +5,7 @@
 
 import junit.framework.TestCase;
 
+import org.junit.experimental.categories.Categories.CategoryFilter;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.RunWith;
