Author: cos Date: Thu May 30 19:09:26 2013 New Revision: 1487980 URL: http://svn.apache.org/r1487980 Log: HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487980&r1=1487979&r2=1487980&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu May 30 19:09:26 2013 @@ -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 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java?rev=1487980&r1=1487979&r2=1487980&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java Thu May 30 19:09:26 2013 @@ -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); }