You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/03 08:23:01 UTC
[1/2] git commit: CAMEL-7032 Align the netty version across the camel
components
Updated Branches:
refs/heads/camel-2.11.x 6bea1e55a -> c68569427
refs/heads/camel-2.12.x 2805a4622 -> 8acc164be
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/8acc164b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8acc164b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8acc164b
Branch: refs/heads/camel-2.12.x
Commit: 8acc164bee35e56456f0a0a6947fcfeda36ca818
Parents: 2805a46
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:21:12 2013 +0800
----------------------------------------------------------------------
components/camel-zookeeper/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8acc164b/components/camel-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index e6a6f8e..46fd035 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 -->
[2/2] git commit: CAMEL-7032 Align the netty version across the camel
components
Posted by ni...@apache.org.
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/c6856942
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c6856942
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c6856942
Branch: refs/heads/camel-2.11.x
Commit: c685694279c0becf7430832c8e616d951f3e232f
Parents: 6bea1e5
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:22:39 2013 +0800
----------------------------------------------------------------------
components/camel-zookeeper/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c6856942/components/camel-zookeeper/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index aa8e0d9..dab41c8 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 -->