git commit: CAMEL-7032 Align the netty version across the camel components

[ni...@apache.org]

Updated Branches:
  refs/heads/master 4f7ffe9ad -> ea882531c


CAMEL-7032 Align the netty version across the camel components


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea882531
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea882531
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea882531

Branch: refs/heads/master
Commit: ea882531c5e07197321e42b9245adbd48002255a
Parents: 4f7ffe9
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Dec 3 15:18:12 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Dec 3 15:18:12 2013 +0800

----------------------------------------------------------------------
 components/camel-zookeeper/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ea882531/components/camel-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 6f09d48..fea0cf5 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -44,6 +44,18 @@
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
+      <!-- Just exclude the old version of netty to avoid netty version conflict-->
+      <exclusions>
+        <exclusion>
+           <groupId>org.jboss.netty</groupId>
+           <artifactId>netty</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+      <version>${netty3-version}</version>
     </dependency>
 
     <!-- test dependencies -->