Updated Branches: refs/heads/trunk 526a096b8 -> 84f4fa61b
FLUME-1723. AsyncHBase and Avro bring in different versions of Netty. (Mike Percy via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/84f4fa61 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/84f4fa61 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/84f4fa61 Branch: refs/heads/trunk Commit: 84f4fa61b6607d8699bb28743b568f4a716b4288 Parents: 526a096 Author: Hari Shreedharan <[email protected]> Authored: Sat Nov 17 18:02:36 2012 -0800 Committer: Hari Shreedharan <[email protected]> Committed: Sat Nov 17 18:03:17 2012 -0800 ---------------------------------------------------------------------- flume-ng-core/pom.xml | 5 +++ flume-ng-sdk/pom.xml | 5 +++ flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 7 ++++ pom.xml | 36 ++++++++++++++++------- 4 files changed, 42 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/84f4fa61/flume-ng-core/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml index d01baca..2554a0e 100644 --- a/flume-ng-core/pom.xml +++ b/flume-ng-core/pom.xml @@ -163,6 +163,11 @@ limitations under the License. </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + + <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/84f4fa61/flume-ng-sdk/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index 1deab7e..ab066d5 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -100,5 +100,10 @@ limitations under the License. <artifactId>avro-ipc</artifactId> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/84f4fa61/flume-ng-sinks/flume-ng-hbase-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml index badb496..25422e1 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml @@ -68,10 +68,17 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> + <dependency> <groupId>org.hbase</groupId> <artifactId>asynchbase</artifactId> </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> http://git-wip-us.apache.org/repos/asf/flume/blob/84f4fa61/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 76b8351..875c4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -683,6 +683,10 @@ limitations under the License. <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> </exclusions> </dependency> @@ -934,17 +938,27 @@ limitations under the License. <version>2.0.4</version> </dependency> - <dependency> - <groupId>org.hbase</groupId> - <artifactId>asynchbase</artifactId> - <version>1.2.0</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.hbase</groupId> + <artifactId>asynchbase</artifactId> + <version>1.2.0</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + <version>3.4.0.Final</version> + </dependency> </dependencies> </dependencyManagement>
