Browse Source

HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487980 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Boudnik 12 years ago
parent
commit
9f551fa542

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -737,6 +737,8 @@ Release 2.0.5-beta - UNRELEASED
 
     HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
 
+    HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

+ 2 - 2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java

@@ -18,7 +18,7 @@
 package org.apache.hadoop.test;
 
 import org.junit.Rule;
-import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 
 /**
@@ -30,5 +30,5 @@ import org.junit.rules.Timeout;
 public class UnitTestcaseTimeLimit {
   public final int timeOutSecs = 10;
   
-  @Rule public MethodRule globalTimeout = new Timeout(timeOutSecs * 1000);
+  @Rule public TestRule globalTimeout = new Timeout(timeOutSecs * 1000);
 }

+ 1 - 1
hadoop-project/pom.xml

@@ -520,7 +520,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.2</version>
+        <version>4.10</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>