[carbondata] branch master updated: [HOTFIX] Exclude netty-all in lower version which could conflict with higher version

[jackylk]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 552cadb  [HOTFIX] Exclude netty-all in lower version which could 
conflict with higher version
552cadb is described below

commit 552cadb2c1a2cf8a14a1864d256310effdf4c22c
Author: Zhangshunyu <zhangshunyu1...@126.com>
AuthorDate: Thu Mar 12 11:37:55 2020 +0800

    [HOTFIX] Exclude netty-all in lower version which could conflict with 
higher version
    
    Why is this PR needed?
    exclude netty-all in lower version which could conflict with higher version
    
    What changes were proposed in this PR?
    pom is modified
    
    Does this PR introduce any user interface change?
    No
    
    Is any new testcase added?
    No
    
    This closes #3666
---
 examples/flink/pom.xml | 11 +++++++++++
 examples/spark/pom.xml | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml
index f87f68b..f746060 100644
--- a/examples/flink/pom.xml
+++ b/examples/flink/pom.xml
@@ -44,6 +44,17 @@
       <groupId>org.apache.flink</groupId>
       <artifactId>flink-clients_${scala.binary.version}</artifactId>
       <version>${flink.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-all</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>4.1.17.Final</version>
     </dependency>
     <dependency>
       <groupId>org.apache.carbondata</groupId>
diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
index c4d2154..5f10c06 100644
--- a/examples/spark/pom.xml
+++ b/examples/spark/pom.xml
@@ -53,6 +53,17 @@
       <groupId>org.alluxio</groupId>
       <artifactId>alluxio-core-client-hdfs</artifactId>
       <version>1.8.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-all</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>4.1.17.Final</version>
     </dependency>
     <dependency>
       <groupId>org.alluxio</groupId>