[shardingsphere] branch master updated: fix netty conflict problem (#7299)

[zh...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2653169  fix netty conflict problem (#7299)
2653169 is described below

commit 265316953702d2b4bafea781d9bdf90f012c9573
Author: xbkaishui <xb...@126.com>
AuthorDate: Mon Sep 7 21:37:41 2020 +0800

    fix netty conflict problem (#7299)
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 44b3bc5..2b9957b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <groovy.version>2.4.19</groovy.version>
         <snakeyaml.version>1.16</snakeyaml.version>
         
-        <netty.version>4.1.42.Final</netty.version>
+        <netty.version>4.1.45.Final</netty.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-cli.version>1.4</commons-cli.version>
         <commons-collections4.version>4.2</commons-collections4.version>
@@ -299,8 +299,8 @@
                 <version>${curator.version}</version>
                 <exclusions>
                     <exclusion>
-                        <artifactId>netty</artifactId>
                         <groupId>io.netty</groupId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>