This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch 1.20 in repository https://gitbox.apache.org/repos/asf/drill.git
commit abce5952784bf3aa5f743c9b263a51326a4e8fb6 Author: James Turton <[email protected]> AuthorDate: Wed Jul 13 06:55:10 2022 +0200 DRILL-8257: Resolve Netty lib conflicts (#2593) Introduce Netty BOM and remove all Netty exclusions from POMs. --- contrib/format-maprdb/pom.xml | 40 ------ contrib/storage-hbase/pom.xml | 16 --- contrib/storage-hive/core/pom.xml | 8 -- distribution/pom.xml | 6 +- exec/java-exec/pom.xml | 56 -------- exec/rpc/pom.xml | 20 --- logical/pom.xml | 10 ++ metastore/iceberg-metastore/pom.xml | 4 - metastore/metastore-api/pom.xml | 8 -- pom.xml | 268 +----------------------------------- 10 files changed, 18 insertions(+), 418 deletions(-) diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml index 1c09b45817..a2285ece89 100644 --- a/contrib/format-maprdb/pom.xml +++ b/contrib/format-maprdb/pom.xml @@ -43,14 +43,6 @@ <artifactId>hbase-client</artifactId> <version>${mapr-format-plugin.hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -185,14 +177,6 @@ <artifactId>log4j-over-slf4j</artifactId> <groupId>org.slf4j</groupId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -239,14 +223,6 @@ <classifier>tests</classifier> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -260,14 +236,6 @@ <artifactId>log4j-over-slf4j</artifactId> <groupId>org.slf4j</groupId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -277,14 +245,6 @@ <classifier>tests</classifier> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 8a9a5a7db1..53625d7462 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -177,14 +177,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -257,14 +249,6 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml index c6c5d6b67b..de1ec20885 100644 --- a/contrib/storage-hive/core/pom.xml +++ b/contrib/storage-hive/core/pom.xml @@ -212,14 +212,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> diff --git a/distribution/pom.xml b/distribution/pom.xml index 4bad4fa409..0f4b4a48bc 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -32,7 +32,7 @@ <properties> <aws.java.sdk.version>1.12.211</aws.java.sdk.version> - <oci.hdfs.version>3.3.0.7.0.1</oci.hdfs.version> + <oci.hdfs.version>3.3.1.0.3.6</oci.hdfs.version> </properties> <dependencies> @@ -190,10 +190,6 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index bcdf8c1d74..6cc5216a61 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -393,14 +393,6 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -421,14 +413,6 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> @@ -475,14 +459,6 @@ <scope>test</scope> <classifier>tests</classifier> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -494,14 +470,6 @@ <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> @@ -540,14 +508,6 @@ <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -680,14 +640,6 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> </dependencies> @@ -747,14 +699,6 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> </dependencies> diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml index 138b353ff8..f6e5c4415a 100644 --- a/exec/rpc/pom.xml +++ b/exec/rpc/pom.xml @@ -56,26 +56,6 @@ <classifier>linux-x86_64</classifier> <version>${netty.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-common</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-parent</artifactId> - </exclusion> </exclusions> </dependency> <dependency> diff --git a/logical/pom.xml b/logical/pom.xml index 7e8fb5776e..21a12a377c 100644 --- a/logical/pom.xml +++ b/logical/pom.xml @@ -85,6 +85,16 @@ <artifactId>joda-time</artifactId> </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> diff --git a/metastore/iceberg-metastore/pom.xml b/metastore/iceberg-metastore/pom.xml index 706859355d..8630e147aa 100644 --- a/metastore/iceberg-metastore/pom.xml +++ b/metastore/iceberg-metastore/pom.xml @@ -113,10 +113,6 @@ <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> diff --git a/metastore/metastore-api/pom.xml b/metastore/metastore-api/pom.xml index f61a95a937..4e8cde1b44 100644 --- a/metastore/metastore-api/pom.xml +++ b/metastore/metastore-api/pom.xml @@ -58,14 +58,6 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index fc4a343c91..f32c48bb9f 100644 --- a/pom.xml +++ b/pom.xml @@ -1406,14 +1406,6 @@ <groupId>org.xerial.snappy</groupId> <artifactId>snappy-java</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1425,14 +1417,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1489,14 +1473,6 @@ <groupId>org.apache.curator</groupId> <artifactId>apache-curator</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -1595,14 +1571,6 @@ <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1682,10 +1650,6 @@ <artifactId>mapr-hbase</artifactId> <version>${mapr.release.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <artifactId>log4j</artifactId> <groupId>log4j</groupId> @@ -1718,14 +1682,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -1753,14 +1709,6 @@ <artifactId>slf4j-log4j12</artifactId> <groupId>org.slf4j</groupId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -1781,14 +1729,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1893,14 +1833,6 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-transport-native-epoll</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -1926,14 +1858,6 @@ <artifactId>log4j</artifactId> <groupId>log4j</groupId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -2076,13 +2000,19 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit4.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement> @@ -2239,10 +2169,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -2390,10 +2316,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -2418,14 +2340,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -2462,14 +2376,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -2486,10 +2392,6 @@ <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -2570,10 +2472,6 @@ <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-jaxrs</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -2763,14 +2661,6 @@ <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> @@ -2840,14 +2730,6 @@ <version>${hbase.version}</version> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3064,14 +2946,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -3083,10 +2957,6 @@ <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> @@ -3167,14 +3037,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -3303,14 +3165,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -3350,14 +3204,6 @@ <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3409,14 +3255,6 @@ <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> @@ -3486,14 +3324,6 @@ <version>${hbase.version}</version> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -3612,14 +3442,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -3643,14 +3465,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -3748,14 +3562,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -3779,14 +3585,6 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -4078,14 +3876,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -4097,10 +3887,6 @@ <artifactId>hadoop-client</artifactId> <version>${hadoop.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <artifactId>commons-logging</artifactId> <groupId>commons-logging</groupId> @@ -4181,14 +3967,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -4283,14 +4061,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> <exclusion> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> @@ -4334,14 +4104,6 @@ <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -4393,14 +4155,6 @@ <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> @@ -4470,14 +4224,6 @@ <version>${hbase.version}</version> <scope>test</scope> <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty</artifactId> - </exclusion> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - </exclusion> <exclusion> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId>
