AjayKemparaj: JUnit 4.11 and hamcrest ugrades finally

r18173
vladfridman · Nov 17, 2012 · 9fbd6f6 · 9fbd6f6
1 parent 843b1b4
commit 9fbd6f6
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/.idea/libraries/hamcrest.xml b/.idea/libraries/hamcrest.xml
diff --git a/.idea/libraries/junit.xml b/.idea/libraries/junit.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.10.jar" sourcepath="/third-party/java/junit/junit-dep-4.10-src.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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.1.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/testng/testng-6.8.jar" sourcepath="/third-party/java/testng/testng-6.8-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-13.0.1.jar" sourcepath="/third-party/java/guava-libraries/guava-13.0.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.10.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.10-sources.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -9,9 +9,9 @@
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-13.0.1.jar" sourcepath="/third-party/java/guava-libraries/guava-13.0.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpclient-4.2.1.jar" sourcepath="/third-party/java/apache-httpclient/httpclient-4.2.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/apache-httpclient/httpcore-4.2.1.jar" sourcepath="/third-party/java/apache-httpclient/httpcore-4.2.1-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.10.jar" sourcepath="/third-party/java/junit/junit-dep-4.10-src.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/testng/testng-6.8.jar" sourcepath="/third-party/java/testng/testng-6.8-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcprov-jdk15on-147.jar" sourcepath="/third-party/java/bouncycastle/bcprov-jdk15on-147-src.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"/>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -166,7 +166,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.10</version>
+                <version>4.11</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
@@ -191,7 +191,7 @@
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-all</artifactId>
-                <version>1.1</version>
+                <version>1.3</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>

diff --git a/third_party/java/hamcrest/build.desc b/third_party/java/hamcrest/build.desc
@@ -1,5 +1,5 @@
 java_library(name = "hamcrest",
   deps = [ 
-    "hamcrest-core-1.1.jar",
-    "hamcrest-library-1.1.jar",
+    "hamcrest-core-1.3.jar",
+    "hamcrest-library-1.3.jar",
   ])
diff --git a/third_party/java/hamcrest/hamcrest-core-1.1.jar b/third_party/java/hamcrest/hamcrest-core-1.1.jar
diff --git a/third_party/java/hamcrest/hamcrest-core-1.3.jar b/third_party/java/hamcrest/hamcrest-core-1.3.jar
diff --git a/third_party/java/hamcrest/hamcrest-library-1.1.jar b/third_party/java/hamcrest/hamcrest-library-1.1.jar
diff --git a/third_party/java/hamcrest/hamcrest-library-1.3.jar b/third_party/java/hamcrest/hamcrest-library-1.3.jar
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.10.jar",
+    "junit-dep-4.11.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-dep-4.10-src.jar b/third_party/java/junit/junit-dep-4.10-src.jar
diff --git a/third_party/java/junit/junit-dep-4.10.jar b/third_party/java/junit/junit-dep-4.10.jar
diff --git a/third_party/java/junit/junit-dep-4.11.jar b/third_party/java/junit/junit-dep-4.11.jar