[activemq] branch master updated: [AMQ-7409] Exclude netty from zookeeper dependency

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new ae96af6  [AMQ-7409] Exclude netty from zookeeper dependency
     new 344bf79  Merge pull request #460 from jbonofre/AMQ-7409
ae96af6 is described below

commit ae96af6d0fb75669cfa056ddfa6502ecf44270b3
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Feb 18 14:28:27 2020 +0100

    [AMQ-7409] Exclude netty from zookeeper dependency
    
    Credit To: Piyush Chugh <chughpiyush>
---
 activemq-partition/pom.xml | 6 ++++++
 assembly/pom.xml           | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index baea49d..5659acb 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -69,6 +69,12 @@
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>${zookeeper-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- For Optional Snappy Compression -->
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 69f1bc7..9604a6c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -100,6 +100,12 @@
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
       <version>${zookeeper-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>