From 65d5b0b9d3659270619ee8330bbaa6703e79f3ec Mon Sep 17 00:00:00 2001
From: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Date: Tue, 6 Sep 2011 14:58:30 +0000
Subject: [PATCH] HADOOP-7606. svn merge -c r1164779 --ignore-ancestry
 ../../trunk/

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165692 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-project/pom.xml                          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 253953a5d2e..c5dff293b7b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -553,6 +553,9 @@ Release 0.23.0 - Unreleased
     HADOOP-7593. Fix AssertionError in TestHttpServer.testMaxThreads().
     (Uma Maheswara Rao G via szetszwo)
 
+    HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
+    by Jersey (Alejandro Abdelnur via atm)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 9e996470806..f012afd7766 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -344,7 +344,7 @@
       <dependency>
         <groupId>org.codehaus.jackson</groupId>
         <artifactId>jackson-mapper-asl</artifactId>
-        <version>1.6.9</version>
+        <version>1.7.1</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>