Merge branch '1.10_release_4.0.x' into 1.10_release_4.1.x

Author: gituser

hbase/hbase-side/hbase-all-side/pom.xml

@@ -33,10 +33,6 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty</artifactId>
                 </exclusion>
-                <exclusion>
-                    <artifactId>netty-all</artifactId>
-                    <groupId>io.netty</groupId>
-                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>

hbase/pom.xml

@@ -38,12 +38,8 @@
                     <groupId>log4j</groupId>
                 </exclusion>
                 <exclusion>
-                    <artifactId>netty-all</artifactId>
                     <groupId>io.netty</groupId>
-                </exclusion>
-                <exclusion>
                     <artifactId>netty</artifactId>
-                    <groupId>io.netty</groupId>
                 </exclusion>
             </exclusions>
         </dependency>

redis5/redis5-side/redis-async-side/pom.xml

@@ -35,14 +35,20 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>io.netty</pattern>
+                                    <shadedPattern>com.dtstack.flink.sql.side.redis.io.netty</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <artifactSet>
                                 <excludes>