java: Upgrading JUnit to 4.12

SeleniumHQ · Jun 7, 2015 · e20faa0 · e20faa0
1 parent 5331865
commit e20faa0
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/.idea/libraries/junit.xml b/.idea/libraries/junit.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/junit/junit-4.12.jar" sourcepath="/third-party/java/junit/junit-4.12-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -10,7 +10,7 @@
 	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.4.1.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.4.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.11.jar" sourcepath="/third-party/java/junit/junit-dep-4.11-src.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/junit/junit-4.12.jar" sourcepath="/third-party/java/junit/junit-4.12-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcprov-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcprov-jdk15on-1.48-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-7.6.1.jar" sourcepath="/third-party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-5.jar" sourcepath="/third-party/java/jetty/jetty-repacked-5-sources.jar"/>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -165,7 +165,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>4.12</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.jna</groupId>

diff --git a/third_party/java/junit/BUCK b/third_party/java/junit/BUCK
@@ -1,6 +1,6 @@
 prebuilt_jar(name = 'junit',
-  binary_jar = 'junit-dep-4.11.jar',
-  source_jar = 'junit-4.11-src.jar',
+  binary_jar = 'junit-4.12.jar',
+  source_jar = 'junit-4.12-sources.jar',
   deps = [
     '//third_party/java/hamcrest:hamcrest',
   ],

diff --git a/third_party/java/junit/build.desc b/third_party/java/junit/build.desc
@@ -1,5 +1,5 @@
 java_library(name = "junit",
   deps = [
-    "junit-dep-4.11.jar",
+    "junit-4.12.jar",
     "//third_party/java/hamcrest",
   ])
diff --git a/third_party/java/junit/junit-4.11-src.jar b/third_party/java/junit/junit-4.11-src.jar
diff --git a/third_party/java/junit/junit-4.12-sources.jar b/third_party/java/junit/junit-4.12-sources.jar
diff --git a/third_party/java/junit/junit-4.12.jar b/third_party/java/junit/junit-4.12.jar
diff --git a/third_party/java/junit/junit-dep-4.11.jar b/third_party/java/junit/junit-dep-4.11.jar