You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/07/19 06:20:21 UTC

svn commit: r1363216 - in /hbase/trunk: hbase-server/pom.xml pom.xml

Author: tedyu
Date: Thu Jul 19 04:20:20 2012
New Revision: 1363216

URL: http://svn.apache.org/viewvc?rev=1363216&view=rev
Log:
HBASE-6421 [pom] add jettison and fix netty specification (Jesse Yates)


Modified:
    hbase/trunk/hbase-server/pom.xml
    hbase/trunk/pom.xml

Modified: hbase/trunk/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/pom.xml?rev=1363216&r1=1363215&r2=1363216&view=diff
==============================================================================
--- hbase/trunk/hbase-server/pom.xml (original)
+++ hbase/trunk/hbase-server/pom.xml Thu Jul 19 04:20:20 2012
@@ -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 -->

Modified: hbase/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/pom.xml?rev=1363216&r1=1363215&r2=1363216&view=diff
==============================================================================
--- hbase/trunk/pom.xml (original)
+++ hbase/trunk/pom.xml Thu Jul 19 04:20:20 2012
@@ -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>
@@ -900,6 +902,16 @@
       </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>
         <version>${metrics-core.version}</version>