From d90f009688541676002fe539da8396d01d444cfe Mon Sep 17 00:00:00 2001
From: Zhihong Yu <tedyu@apache.org>
Date: Thu, 19 Jul 2012 04:20:20 +0000
Subject: [PATCH] HBASE-6421 [pom] add jettison and fix netty specification
 (Jesse Yates)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1363216 13f79535-47bb-0310-9956-ffa450edef68
---
 hbase-server/pom.xml |  7 ++++++-
 pom.xml              | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 850aa03eec3..54aa41b2558 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -301,7 +301,6 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.5.0.Final-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.yammer.metrics</groupId>
@@ -492,6 +491,12 @@
       </exclusions>
       <scope>test</scope>
     </dependency>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <profiles>
     <!-- Skip the tests in this module -->
diff --git a/pom.xml b/pom.xml
index 215b986178f..341004a640d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -826,6 +826,8 @@
     <hadoop-snappy.version>0.0.1-SNAPSHOT</hadoop-snappy.version>
     <clover.version>2.6.3</clover.version>
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
+    <jettison.version>1.3.1</jettison.version>
+    <netty.version>3.5.0.Final-SNAPSHOT</netty.version>
     <!-- Plugin Dependencies -->
     <maven.assembly.version>2.3</maven.assembly.version>
     <maven.antrun.version>1.6</maven.antrun.version>
@@ -899,6 +901,16 @@
         <scope>test</scope>
       </dependency>
       <!-- General dependencies -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jettison</groupId>
+        <artifactId>jettison</artifactId>
+        <version>${jettison.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.yammer.metrics</groupId>
         <artifactId>metrics-core</artifactId>