diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f1675b4fab..920bc6cbee 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/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 diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java index 5581c7d75d..e992fea0f3 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java +++ b/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 @@ public class UnitTestcaseTimeLimit { public final int timeOutSecs = 10; - @Rule public MethodRule globalTimeout = new Timeout(timeOutSecs * 1000); + @Rule public TestRule globalTimeout = new Timeout(timeOutSecs * 1000); } diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 3938532c80..80ae31800a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -520,7 +520,7 @@ junit junit - 4.8.2 + 4.10 commons-lang