diff --git a/beeline/pom.xml b/beeline/pom.xml
index 0d25ef9f1628..971a6316ce35 100644
--- a/beeline/pom.xml
+++ b/beeline/pom.xml
@@ -99,6 +99,20 @@
${project.version}
tests
test
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive
diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml
index 9dc245668b7f..d81e49280a56 100644
--- a/hcatalog/core/pom.xml
+++ b/hcatalog/core/pom.xml
@@ -66,6 +66,20 @@
${project.version}
test-jar
test
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml
index 66f11852a295..49c686117f3e 100644
--- a/hcatalog/hcatalog-pig-adapter/pom.xml
+++ b/hcatalog/hcatalog-pig-adapter/pom.xml
@@ -101,6 +101,20 @@
${project.version}
test-jar
test
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
diff --git a/hcatalog/server-extensions/pom.xml b/hcatalog/server-extensions/pom.xml
index 4f334e438cf6..4756f1dd3ae9 100644
--- a/hcatalog/server-extensions/pom.xml
+++ b/hcatalog/server-extensions/pom.xml
@@ -75,6 +75,20 @@
${project.version}
test-jar
test
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
diff --git a/hcatalog/webhcat/java-client/pom.xml b/hcatalog/webhcat/java-client/pom.xml
index f19f18b91ff5..ff3f660fd6f9 100644
--- a/hcatalog/webhcat/java-client/pom.xml
+++ b/hcatalog/webhcat/java-client/pom.xml
@@ -73,6 +73,20 @@
${project.version}
test-jar
test
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive.hcatalog
diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml
index 4e05f4efac26..8f359a2e9ca0 100644
--- a/itests/hive-minikdc/pom.xml
+++ b/itests/hive-minikdc/pom.xml
@@ -116,6 +116,20 @@
${project.version}
test
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml
index 422a2fe4c12d..1b1cc56b97b3 100644
--- a/itests/hive-unit-hadoop2/pom.xml
+++ b/itests/hive-unit-hadoop2/pom.xml
@@ -97,6 +97,20 @@
hive-exec
${project.version}
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml
index 8dc79712cd39..d74ac342d213 100644
--- a/itests/hive-unit/pom.xml
+++ b/itests/hive-unit/pom.xml
@@ -49,6 +49,20 @@
hive-exec
${project.version}
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive
diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml
index 3fae45ca2580..1079bedde980 100644
--- a/itests/qtest-accumulo/pom.xml
+++ b/itests/qtest-accumulo/pom.xml
@@ -63,6 +63,20 @@
${project.version}
test
core
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive
@@ -70,6 +84,20 @@
${project.version}
test
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive
diff --git a/itests/util/pom.xml b/itests/util/pom.xml
index 7d360a179817..00a5d2e87d80 100644
--- a/itests/util/pom.xml
+++ b/itests/util/pom.xml
@@ -100,6 +100,20 @@
hive-exec
${project.version}
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive
diff --git a/service/pom.xml b/service/pom.xml
index 08fb52f31b6c..4f5439037c63 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -147,6 +147,20 @@
${project.version}
test
tests
+
+
+ org.apache.calcite
+ calcite-core
+
+
+ org.apache.calcite
+ calcite-druid
+
+
+ org.apache.calcite.avatica
+ avatica
+
+
org.apache.hive