This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2bf5f7fb8fbc7a12d257b2fdff4e864d46e3ba81 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Tue Nov 19 15:32:42 2019 +0000 Removing unnecessary netty exclusion from zookeeper poms --- components/camel-zookeeper-master/pom.xml | 10 ---------- components/camel-zookeeper/pom.xml | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml index 7d61b85..fb25a6f 100644 --- a/components/camel-zookeeper-master/pom.xml +++ b/components/camel-zookeeper-master/pom.xml @@ -53,13 +53,8 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper-version}</version> - <!-- Just exclude the old version of netty to avoid netty version conflict--> <exclusions> <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> @@ -69,11 +64,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>${netty3-version}</version> - </dependency> <dependency> <groupId>org.apache.curator</groupId> diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml index 739d752..a421f07 100644 --- a/components/camel-zookeeper/pom.xml +++ b/components/camel-zookeeper/pom.xml @@ -46,13 +46,8 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper-version}</version> - <!-- Just exclude the old version of netty to avoid netty version conflict--> <exclusions> <exclusion> - <groupId>org.jboss.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> @@ -63,12 +58,6 @@ </exclusions> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - <version>${netty3-version}</version> - </dependency> - - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> <version>${curator-version}</version>
