From 529515100c099cc28f72cf53578dec551d4334d9 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Tue, 28 Feb 2012 19:01:10 +0000
Subject: [PATCH] Merge -r 1294783:1294784 from trunk to branch. FIXES:
 HADOOP-8104

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

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4a0e25ab65c..fcec211b481 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -86,7 +86,9 @@ Release 0.23.3 - UNRELEASED
     HADOOP-7931. o.a.h.ipc.WritableRpcEngine should have a way to force
     initialization. (atm)
 
-Release 0.23.2 - UNRELEASED
+    HADOOP-8104. Inconsistent Jackson versions (tucu)
+
+Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES
 
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 746f90643fe..9d79113e8fc 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -540,6 +540,21 @@
         <artifactId>jackson-mapper-asl</artifactId>
         <version>1.8.8</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>1.8.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>1.8.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-xc</artifactId>
+        <version>1.8.8</version>
+      </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjtools</artifactId>