HBASE-14027 clean up multiple netty jars.

This commit is contained in:
Sean Busbey 2015-07-06 17:00:51 -05:00
parent 2f327c9110
commit 25f7e804cd
3 changed files with 14 additions and 3 deletions

View File

@ -251,10 +251,12 @@
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
</dependency> </dependency>
<!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
<dependency> <dependency>
<groupId>org.jboss.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>3.2.4.Final</version> <version>${netty.hadoop.version}</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -677,7 +677,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
<version>3.6.2.Final</version> <version>${netty.hadoop.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -1194,6 +1194,7 @@
<jamon-runtime.version>2.3.1</jamon-runtime.version> <jamon-runtime.version>2.3.1</jamon-runtime.version>
<jettison.version>1.3.3</jettison.version> <jettison.version>1.3.3</jettison.version>
<netty.version>4.0.23.Final</netty.version> <netty.version>4.0.23.Final</netty.version>
<netty.hadoop.version>3.6.2.Final</netty.hadoop.version>
<joni.version>2.1.2</joni.version> <joni.version>2.1.2</joni.version>
<jcodings.version>1.0.8</jcodings.version> <jcodings.version>1.0.8</jcodings.version>
<spy.version>2.11.6</spy.version> <spy.version>2.11.6</spy.version>
@ -1977,6 +1978,10 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>stax</groupId> <groupId>stax</groupId>
<artifactId>stax-api</artifactId> <artifactId>stax-api</artifactId>
@ -1999,6 +2004,10 @@
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>stax</groupId> <groupId>stax</groupId>
<artifactId>stax-api</artifactId> <artifactId>stax-api</artifactId>