Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Boudnik 2013-05-30 19:14:26 +00:00
parent baff3aadac
commit d1d9252059
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -375,6 +375,8 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos) 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 Release 2.0.4-alpha - 2013-04-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java
View File

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

2
hadoop-project/pom.xml
View File

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