You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/09/17 17:41:26 UTC
svn commit: r1524096 - in /hbase/branches/0.96: hbase-client/pom.xml
hbase-protocol/pom.xml pom.xml
Author: nkeywal
Date: Tue Sep 17 15:41:25 2013
New Revision: 1524096
URL: http://svn.apache.org/r1524096
Log:
HBASE-9557 strange dependencies for hbase-client
Modified:
hbase/branches/0.96/hbase-client/pom.xml
hbase/branches/0.96/hbase-protocol/pom.xml
hbase/branches/0.96/pom.xml
Modified: hbase/branches/0.96/hbase-client/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/pom.xml?rev=1524096&r1=1524095&r2=1524096&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/pom.xml (original)
+++ hbase/branches/0.96/hbase-client/pom.xml Tue Sep 17 15:41:25 2013
@@ -185,6 +185,28 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -193,6 +215,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey.jersey-test-framework</groupId>
+ <artifactId>jersey-test-framework-grizzly2</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
Modified: hbase/branches/0.96/hbase-protocol/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-protocol/pom.xml?rev=1524096&r1=1524095&r2=1524096&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-protocol/pom.xml (original)
+++ hbase/branches/0.96/hbase-protocol/pom.xml Tue Sep 17 15:41:25 2013
@@ -160,10 +160,6 @@
<dependencies>
<!-- Intra-project dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- </dependency>
<!-- General dependencies -->
<dependency>
<groupId>com.google.protobuf</groupId>
Modified: hbase/branches/0.96/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/pom.xml?rev=1524096&r1=1524095&r2=1524096&view=diff
==============================================================================
--- hbase/branches/0.96/pom.xml (original)
+++ hbase/branches/0.96/pom.xml Tue Sep 17 15:41:25 2013
@@ -856,12 +856,12 @@
<commons-logging.version>1.1.1</commons-logging.version>
<commons-math.version>2.2</commons-math.version>
<collections.version>3.2.1</collections.version>
- <httpclient.version>3.0.1</httpclient.version>
+ <httpclient.version>3.1</httpclient.version>
<metrics-core.version>2.1.2</metrics-core.version>
<guava.version>12.0.1</guava.version>
<jackson.version>1.8.8</jackson.version>
<jasper.version>5.5.23</jasper.version>
- <jaxb-api.version>2.1</jaxb-api.version>
+ <jaxb-api.version>2.2.2</jaxb-api.version>
<jetty.version>6.1.26</jetty.version>
<jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<jersey.version>1.8</jersey.version>
@@ -879,7 +879,7 @@
<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.9.Final</netty.version>
+ <netty.version>3.6.6.Final</netty.version>
<!-- Plugin Dependencies -->
<maven.assembly.version>2.4</maven.assembly.version>
<maven.antrun.version>1.6</maven.antrun.version>