[incubator-iotdb] branch rel/0.8 updated: add netty version declarion for sloving the conflict of hadoop and spark

[hx...@apache.org]

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

hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/rel/0.8 by this push:
     new b7e8c7d  add netty version declarion for sloving the conflict of hadoop and spark
b7e8c7d is described below

commit b7e8c7d27a8b758fe8571a5f3591f813d27831a7
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Dec 1 15:24:53 2019 +0800

    add netty version declarion for sloving the conflict of hadoop and spark
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 97c965a..dbf08cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,6 +353,12 @@
                 <artifactId>airline</artifactId>
                 <version>${airline.version}</version>
             </dependency>
+            <!-- nettry version is conflict in spark and hadoop, so that we have to declare here -->
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty</artifactId>
+                <version>3.9.9.Final</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>