[zeppelin] branch master updated: [ZEPPELIN-4239] Fix `netty-all-4.0.23.Final.jar` version conflict

[li...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4c517a4  [ZEPPELIN-4239] Fix `netty-all-4.0.23.Final.jar` version conflict
4c517a4 is described below

commit 4c517a4fad21acf022a02cff88e3443f4a8af6c9
Author: Xun Liu <li...@apache.org>
AuthorDate: Sun Jul 14 16:58:52 2019 +0800

    [ZEPPELIN-4239] Fix `netty-all-4.0.23.Final.jar` version conflict
    
    ### What is this PR for?
    Cluster mode depends on `netty-*-4.1.27.Final.jar` and zeppelin-zengine's `netty-all-4.0.23.Final.jar` version conflicts
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4239
    
    ### How should this be tested?
    * [CI pass](https://travis-ci.org/liuxunorg/zeppelin/builds/558725065)
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update?
    * Is there breaking changes for older versions?
    * Does this needs documentation?
    
    Author: Xun Liu <li...@apache.org>
    
    Closes #3406 from liuxunorg/ZEPPELIN-4239 and squashes the following commits:
    
    e549e67cf [Xun Liu] [ZEPPELIN-4239] Fix netty-all-4.0.23.Final.jar version conflict
---
 zeppelin-zengine/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index 41d414d..ab08603 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -349,6 +349,10 @@
               <artifactId>netty</artifactId>
             </exclusion>
             <exclusion>
+              <groupId>io.netty</groupId>
+              <artifactId>netty-all</artifactId>
+            </exclusion>
+            <exclusion>
               <groupId>commons-httpclient</groupId>
               <artifactId>commons-httpclient</artifactId>
             </exclusion>
@@ -532,6 +536,10 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>io.netty</groupId>
+              <artifactId>netty-all</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>