diff --git druid-handler/pom.xml druid-handler/pom.xml
index 7d5c3f4ea1..5ee99b1e9d 100644
--- druid-handler/pom.xml
+++ druid-handler/pom.xml
@@ -50,11 +50,7 @@
io.netty
- netty-all
-
-
- io.netty
- netty
+ *
com.google.guava
@@ -85,6 +81,11 @@
joda-time
${joda.version}
+
+ io.netty
+ netty
+ ${netty3.version}
+
org.apache.druid
druid-server
@@ -106,6 +107,10 @@
org.apache.druid
druid-aws-common
+
+ io.netty
+ *
+
true
@@ -214,7 +219,7 @@
io.netty
- netty
+ *
com.google.guava
diff --git itests/qtest-druid/pom.xml itests/qtest-druid/pom.xml
index 6da72733e7..6d9fdc574d 100644
--- itests/qtest-druid/pom.xml
+++ itests/qtest-druid/pom.xml
@@ -64,6 +64,10 @@
jersey-core
com.sun.jersey
+
+ io.netty
+ *
+
diff --git itests/qtest/pom.xml itests/qtest/pom.xml
index f6fce77835..1cc562be3f 100644
--- itests/qtest/pom.xml
+++ itests/qtest/pom.xml
@@ -209,6 +209,12 @@
hadoop-hdfs
test
+
+ io.netty
+ netty-all
+ ${netty.hadoop.version}
+ test
+
org.apache.hadoop
hadoop-mapreduce-client-jobclient
@@ -395,6 +401,10 @@
commons-logging
commons-logging
+
+ io.netty
+ *
+
diff --git itests/util/pom.xml itests/util/pom.xml
index ecdeabd291..84815f97bf 100644
--- itests/util/pom.xml
+++ itests/util/pom.xml
@@ -233,6 +233,10 @@
commons-logging
commons-logging
+
+ io.netty
+ *
+
diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index bebc37e6af..38e4bac2cc 100644
--- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -30,6 +30,7 @@
import java.net.URL;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Deque;
import java.util.HashSet;
import java.util.LinkedList;
@@ -183,6 +184,8 @@ public QTestUtil(QTestArguments testArgs) throws Exception {
testArgs.isWithLlapIo(),
testArgs.getFsType());
+ logClassPath();
+
Preconditions.checkNotNull(testArgs.getClusterType(), "ClusterType cannot be null");
this.fsType = testArgs.getFsType();
@@ -229,6 +232,12 @@ public QTestUtil(QTestArguments testArgs) throws Exception {
}
+ private void logClassPath() {
+ String classpath = System.getProperty("java.class.path");
+ String[] classpathEntries = classpath.split(File.pathSeparator);
+ LOG.info("QTestUtil classpath: " + String.join("\n", Arrays.asList(classpathEntries)));
+ }
+
private void setMetaStoreProperties() {
setMetastoreConfPropertyFromSystemProperty(MetastoreConf.ConfVars.CONNECT_URL_KEY);
setMetastoreConfPropertyFromSystemProperty(MetastoreConf.ConfVars.CONNECTION_DRIVER);
diff --git jdbc/pom.xml jdbc/pom.xml
index 3d0719be4b..0fa27d5062 100644
--- jdbc/pom.xml
+++ jdbc/pom.xml
@@ -93,8 +93,8 @@
${zookeeper.version}
- org.jboss.netty
- netty
+ io.netty
+ *
@@ -244,7 +244,6 @@
com.zaxxer:*
io.airlift:*
io.dropwizard.metrics:*
- io.netty:*
javax.activation:*
javax.inject:*
javax.jdo:*
@@ -354,6 +353,10 @@
javolution
org.apache.hive.javolution
+
+ io.netty
+ org.apache.hive.io.netty
+
diff --git pom.xml pom.xml
index 579e74568f..3dfac4a3f0 100644
--- pom.xml
+++ pom.xml
@@ -196,8 +196,9 @@
1.10.19
1.7.4
2.0.0-M5
- 4.1.17.Final
+ 4.1.48.Final
3.10.5.Final
+ 4.0.52.Final
1.11.0
0.16.0
1.5.6
@@ -603,8 +604,8 @@
httpclient
- org.jboss.netty
- netty
+ io.netty
+ netty-all
@@ -934,8 +935,8 @@
jruby-complete
- org.jboss.netty
- netty
+ io.netty
+ netty-all
io.netty
diff --git ql/pom.xml ql/pom.xml
index 9b45d31385..67e9afad70 100644
--- ql/pom.xml
+++ ql/pom.xml
@@ -1015,6 +1015,14 @@
org.apache.datasketches:*
org.apache.calcite:*
org.apache.calcite.avatica:avatica
+ io.netty:*
+
+ org.apache.arrow:*
@@ -1050,6 +1058,10 @@
org.apache.datasketches
org.apache.hive.org.apache.datasketches
+
+ io.netty
+ org.apache.hive.io.netty
+
diff --git serde/pom.xml serde/pom.xml
index ca4fee27a5..c4120a039c 100644
--- serde/pom.xml
+++ serde/pom.xml
@@ -67,6 +67,12 @@
org.apache.arrow
arrow-vector
${arrow.version}
+
+
+ io.netty
+ *
+
+
com.carrotsearch
diff --git standalone-metastore/metastore-common/pom.xml standalone-metastore/metastore-common/pom.xml
index 405a06fde7..a9dd69e9a5 100644
--- standalone-metastore/metastore-common/pom.xml
+++ standalone-metastore/metastore-common/pom.xml
@@ -42,6 +42,10 @@
org.apache.hive
hive-storage-api
+
+ io.netty
+ *
+
@@ -141,6 +145,10 @@
commons-logging
commons-logging
+
+ io.netty
+ *
+
@@ -229,8 +237,8 @@
httpclient
- org.jboss.netty
- netty
+ io.netty
+ netty-all
diff --git standalone-metastore/metastore-server/pom.xml standalone-metastore/metastore-server/pom.xml
index 67ebdafc8e..49133271c4 100644
--- standalone-metastore/metastore-server/pom.xml
+++ standalone-metastore/metastore-server/pom.xml
@@ -143,6 +143,10 @@
commons-logging
commons-logging
+
+ io.netty
+ *
+
diff --git standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
index 59b61e15a7..13524a4db4 100644
--- standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
+++ standalone-metastore/metastore-tools/metastore-benchmarks/pom.xml
@@ -68,6 +68,10 @@
org.apache.curator
curator-recipes
+
+ io.netty
+ *
+