From 6c33846767599bc7565b187bea8420d850810fcf Mon Sep 17 00:00:00 2001
From: Aaron Myers <atm@apache.org>
Date: Sat, 3 Sep 2011 00:53:40 +0000
Subject: [PATCH] HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the
 version required by Jersey (Alejandro Abdelnur via atm)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1164779 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 7 ++++++-
 hadoop-project/pom.xml                          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4f0c4cc2ac..206f6649f5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -4,9 +4,14 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
-  HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
+    HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
   HADOOP-7524 Change RPC to allow multiple protocols including multuple versions of the same protocol (sanjay Radia)
 
+  BUGS
+
+    HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
+                 by Jersey (Alejandro Abdelnur via atm)
+
 Release 0.23.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index a1561934ed..290d33d02f 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>