[activemq] branch activemq-5.15.x 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 activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
     new d041209  [AMQ-7409] Exclude netty from zookeeper dependency
d041209 is described below

commit d04120907cadc88872343e2a798661796fcfc3e0
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>
    
    (cherry picked from commit ae96af6d0fb75669cfa056ddfa6502ecf44270b3)
---
 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 dfeb38c..5706f23 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 066fa83..f829676 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>