From d1d9252059ba78bdc642f6a9cf75b0a9baaa978c Mon Sep 17 00:00:00 2001
From: Konstantin Boudnik <cos@apache.org>
Date: Thu, 30 May 2013 19:14:26 +0000
Subject: [PATCH] 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
---
 hadoop-common-project/hadoop-common/CHANGES.txt               | 2 ++
 .../java/org/apache/hadoop/test/UnitTestcaseTimeLimit.java    | 4 ++--
 hadoop-project/pom.xml                                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 494cf7c8783..e00f5c0f2ed 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -375,6 +375,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 5581c7d75da..e992fea0f34 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 7c28bc1ebb3..8a88efc0090 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -519,7 +519,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.2</version>
+        <version>4.10</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>