diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml index f204a85ec5..db50220e3b 100644 --- a/itests/custom-serde/pom.xml +++ b/itests/custom-serde/pom.xml @@ -36,19 +36,13 @@ org.apache.hive hive-exec - ${project.version} true org.apache.hadoop hadoop-common - ${hadoop.version} true - - - - diff --git a/itests/custom-udfs/pom.xml b/itests/custom-udfs/pom.xml index 9955b04d5f..5324b41820 100644 --- a/itests/custom-udfs/pom.xml +++ b/itests/custom-udfs/pom.xml @@ -45,19 +45,4 @@ limitations under the License. udf-vectorized-badexample - - - - org.apache.hive - hive-exec - ${project.version} - true - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - true - - diff --git a/itests/custom-udfs/udf-classloader-udf1/pom.xml b/itests/custom-udfs/udf-classloader-udf1/pom.xml index d3ec376c29..b7cfd64867 100644 --- a/itests/custom-udfs/udf-classloader-udf1/pom.xml +++ b/itests/custom-udfs/udf-classloader-udf1/pom.xml @@ -34,6 +34,14 @@ udf-classloader-util ${project.version} + + org.apache.hive + hive-exec + + + org.apache.hive + hive-serde + diff --git a/itests/custom-udfs/udf-classloader-udf2/pom.xml b/itests/custom-udfs/udf-classloader-udf2/pom.xml index 4e5dee8494..7b3707af5f 100644 --- a/itests/custom-udfs/udf-classloader-udf2/pom.xml +++ b/itests/custom-udfs/udf-classloader-udf2/pom.xml @@ -34,6 +34,14 @@ udf-classloader-util ${project.version} + + org.apache.hive + hive-exec + + + org.apache.hive + hive-serde + diff --git a/itests/custom-udfs/udf-vectorized-badexample/pom.xml b/itests/custom-udfs/udf-vectorized-badexample/pom.xml index d4b278d754..444870ec64 100644 --- a/itests/custom-udfs/udf-vectorized-badexample/pom.xml +++ b/itests/custom-udfs/udf-vectorized-badexample/pom.xml @@ -34,6 +34,14 @@ udf-classloader-util ${project.version} + + org.apache.hive + hive-exec + + + org.apache.hive + hive-serde + diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index ad59ebbe4a..dd551307ec 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -43,106 +43,89 @@ org.apache.hive.hcatalog hive-hcatalog-core - ${project.version} test org.apache.hive.hcatalog hive-hcatalog-core - ${project.version} tests test org.apache.hive.hcatalog hive-hcatalog-pig-adapter - ${project.version} test org.apache.hive.hcatalog hive-hcatalog-server-extensions - ${project.version} test org.apache.hive.hcatalog hive-webhcat-java-client - ${project.version} test org.apache.hive.hcatalog hive-webhcat-java-client - ${project.version} - test-jar + tests test org.apache.hive hive-hbase-handler - ${project.version} test org.apache.hive hive-cli - ${project.version} test org.apache.hive hive-common - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} test org.apache.hive hive-standalone-metastore-server - ${project.version} test org.apache.hive hive-exec - ${project.version} test commons-io commons-io - ${commons-io.version} test junit junit - ${junit.version} test org.apache.hadoop hadoop-annotations - ${hadoop.version} test org.apache.hadoop hadoop-archives - ${hadoop.version} test org.apache.hadoop hadoop-common - ${hadoop.version} test @@ -158,7 +141,6 @@ org.apache.hadoop hadoop-common - ${hadoop.version} tests test @@ -175,26 +157,22 @@ org.apache.hadoop hadoop-hdfs - ${hadoop.version} test org.apache.hadoop hadoop-hdfs - ${hadoop.version} tests test org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} test org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests test @@ -211,19 +189,16 @@ org.apache.hadoop hadoop-yarn-server-tests - ${hadoop.version} test tests com.sun.jersey jersey-servlet - ${jersey.version} org.apache.hadoop hadoop-mapreduce-client-hs - ${hadoop.version} test @@ -239,52 +214,44 @@ org.apache.hbase hbase-client - ${hbase.version} test org.apache.hbase hbase-common - ${hbase.version} test org.apache.hbase hbase-common - ${hbase.version} test tests org.apache.hbase hbase-hadoop-compat - ${hbase.version} test org.apache.hbase hbase-hadoop-compat - ${hbase.version} test tests org.apache.hbase hbase-hadoop2-compat - ${hbase.version} test org.apache.hbase hbase-hadoop2-compat - ${hbase.version} test tests org.apache.hbase hbase-server - ${hbase.version} test @@ -296,13 +263,11 @@ org.apache.hbase hbase-mapreduce - ${hbase.version} test org.apache.hbase hbase-server - ${hbase.version} tests test @@ -334,8 +299,7 @@ org.apache.hive hive-exec - ${project.version} - test-jar + tests test diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index 83c26dace7..40aa0ed567 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -37,72 +37,73 @@ false ${hadoop.version} -mkdir -p + + + 3.3.0 + + com.google.protobuf + protobuf-java + org.apache.hive hive-common - ${project.version} test org.apache.hive hive-contrib - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} tests test org.apache.hive hive-standalone-metastore-server - ${project.version} test org.apache.hive hive-standalone-metastore-server - ${project.version} tests test org.apache.hive hive-it-unit - ${project.version} tests test + + org.apache.hive + hive-it-util + test + org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-exec - ${project.version} test - org.apache.hadoop hadoop-common - ${hadoop.version} test @@ -118,7 +119,6 @@ org.apache.hadoop hadoop-common - ${hadoop.version} tests test @@ -135,7 +135,6 @@ org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests test @@ -152,13 +151,11 @@ org.apache.hadoop hadoop-mapreduce-client-hs - ${hadoop.version} test org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} test @@ -174,19 +171,16 @@ org.apache.tez tez-tests - ${tez.version} - test-jar + tests org.apache.tez tez-api - ${tez.version} test org.apache.tez tez-runtime-library - ${tez.version} test @@ -202,13 +196,11 @@ org.apache.tez tez-mapreduce - ${tez.version} test org.apache.tez tez-dag - ${tez.version} test @@ -224,13 +216,11 @@ junit junit - ${junit.version} test org.apache.hadoop hadoop-aws - ${hadoop.version} compile @@ -246,17 +236,27 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} + + + org.apache.calcite.avatica + avatica-core + + + org.apache.curator + curator-client + test + + + org.apache.curator + curator-framework @@ -315,7 +315,6 @@ org.codehaus.mojo build-helper-maven-plugin - ${maven.build-helper.plugin.version} add-test-sources diff --git a/itests/hive-jmh/pom.xml b/itests/hive-jmh/pom.xml index 8df370ec0e..0939978b94 100644 --- a/itests/hive-jmh/pom.xml +++ b/itests/hive-jmh/pom.xml @@ -51,17 +51,14 @@ org.apache.hive hive-serde - ${project.version} org.apache.tez tez-api - ${tez.version} org.apache.tez tez-runtime-internals - ${tez.version} org.apache.hive @@ -71,23 +68,19 @@ org.apache.hive hive-exec - ${project.version} org.apache.hive hive-exec - ${project.version} tests org.apache.hadoop hadoop-common - ${hadoop.version} org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} @@ -96,7 +89,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.2 package diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 5f675cc95a..f82e76c2de 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -38,102 +38,91 @@ org.apache.hive hive-common - ${project.version} test org.apache.hive hive-beeline - ${project.version} test org.apache.hive hive-cli - ${project.version} test org.apache.hive hive-it-unit - ${project.version} test org.apache.hive hive-it-unit - ${project.version} test tests + + org.apache.hive + hive-it-util + test + org.apache.hive hive-jdbc - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} test tests org.apache.hive hive-standalone-metastore-server - ${project.version} test org.apache.hive hive-standalone-metastore-server - ${project.version} test tests org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-service - ${project.version} test org.apache.hive hive-service - ${project.version} test tests org.apache.hive hive-exec - ${project.version} test org.apache.hive hive-exec - ${project.version} test tests org.apache.tez tez-dag - ${tez.version} test @@ -154,13 +143,11 @@ junit junit - ${junit.version} test org.apache.hadoop hadoop-common - ${hadoop.version} test @@ -176,14 +163,12 @@ org.apache.hadoop hadoop-hdfs - ${hadoop.version} tests test org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests test @@ -200,13 +185,11 @@ org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} test org.apache.hadoop hadoop-minikdc - ${hadoop.version} test @@ -222,7 +205,6 @@ org.apache.hbase hbase-server - ${hbase.version} test @@ -234,7 +216,6 @@ org.apache.hbase hbase-mapreduce - ${hbase.version} test @@ -257,12 +238,32 @@ jersey-servlet test + + org.eclipse.jetty + jetty-rewrite + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + org.eclipse.jetty + jetty-webapp + + + org.eclipse.jetty + jetty-util + - + Windows diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 8647d87f9f..981c0e4223 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -36,27 +36,22 @@ org.apache.hive hive-common - ${project.version} org.apache.hive hive-jdbc - ${project.version} org.apache.hive hive-service - ${project.version} org.apache.hive hive-exec - ${project.version} org.apache.tez tez-dag - ${tez.version} test @@ -78,19 +73,16 @@ org.apache.hive hive-beeline - ${project.version} test org.apache.hive hive-cli - ${project.version} test org.apache.hive hive-it-util - ${project.version} org.apache.hive @@ -102,45 +94,38 @@ org.apache.hive hive-standalone-metastore-common - ${project.version} tests org.apache.hive hive-standalone-metastore-server - ${project.version} tests org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-service - ${project.version} tests org.apache.hive hive-exec - ${project.version} tests junit junit - ${junit.version} test org.apache.hive hive-it-unit - ${project.version} - test-jar + tests test @@ -156,7 +141,6 @@ org.apache.hive hive-it-unit - ${project.version} test @@ -173,24 +157,20 @@ org.apache.hadoop hadoop-common - ${hadoop.version} org.apache.hadoop hadoop-distcp - ${hadoop.version} org.apache.hadoop hadoop-hdfs - ${hadoop.version} tests test org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests test @@ -207,19 +187,16 @@ org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} test org.apache.hadoop hadoop-mapreduce-client-common - ${hadoop.version} test org.apache.hbase hbase-server - ${hbase.version} test @@ -231,7 +208,6 @@ org.apache.hbase hbase-mapreduce - ${hbase.version} test diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 6d6c8d260f..7e7d7dbd5f 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -37,73 +37,59 @@ org.apache.hive hive-common - ${project.version} org.apache.hive hive-jdbc - ${project.version} org.apache.hive hive-jdbc-handler - ${project.version} org.apache.hive hive-service - ${project.version} org.apache.hive hive-exec - ${project.version} org.apache.hive hive-llap-server - ${project.version} org.apache.hive hive-llap-ext-client - ${project.version} org.apache.hive hive-llap-server - ${project.version} - test-jar + tests org.apache.hive.hcatalog hive-hcatalog-core - ${project.version} org.apache.hive.hcatalog hive-hcatalog-streaming - ${project.version} org.apache.hive hive-streaming - ${project.version} org.apache.hive.hcatalog hive-hcatalog-server-extensions - ${project.version} org.apache.hive.hcatalog hive-webhcat-java-client - ${project.version} org.apache.hive hive-it-util - ${project.version} org.apache.hive @@ -115,7 +101,6 @@ org.apache.hadoop hadoop-common - ${hadoop.version} org.slf4j @@ -130,8 +115,7 @@ org.apache.tez tez-tests - ${tez.version} - test-jar + tests org.slf4j @@ -160,76 +144,64 @@ org.apache.hive hive-beeline - ${project.version} test org.apache.hadoop hadoop-distcp - ${hadoop.version} test org.apache.hive hive-cli - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} tests org.apache.hive hive-standalone-metastore-server - ${project.version} tests org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-service - ${project.version} tests org.apache.hive hive-exec - ${project.version} tests org.apache.hive hive-common - ${project.version} - test-jar + tests test - org.apache.hive.hcatalog - hive-webhcat-java-client - ${project.version} - test-jar - test + org.apache.hive.hcatalog + hive-webhcat-java-client + tests + test junit junit - ${junit.version} test org.apache.hadoop hadoop-hdfs - ${hadoop.version} tests test @@ -242,7 +214,6 @@ org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests test @@ -259,19 +230,16 @@ org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} test org.apache.hadoop hadoop-mapreduce-client-common - ${hadoop.version} test org.apache.hbase hbase-server - ${hbase.version} org.glassfish.web @@ -282,34 +250,29 @@ org.apache.hbase hbase-server - ${hbase.version} - test-jar + tests org.apache.hbase hbase-common - ${hbase.version} tests test org.apache.hbase hbase-procedure - ${hbase.version} test org.apache.hbase hbase-hadoop-compat - ${hbase.version} - test-jar + tests test org.apache.hbase hbase-hadoop2-compat - ${hbase.version} - test-jar + tests test @@ -335,13 +298,11 @@ org.apache.hadoop hadoop-archives - ${hadoop.version} test org.apache.hadoop hadoop-common - ${hadoop.version} tests test @@ -358,7 +319,6 @@ org.apache.hadoop hadoop-mapreduce-client-hs - ${hadoop.version} test @@ -374,13 +334,11 @@ org.apache.tez tez-api - ${tez.version} test org.apache.tez tez-runtime-library - ${tez.version} test @@ -396,7 +354,6 @@ org.apache.tez tez-runtime-internals - ${tez.version} test @@ -412,13 +369,11 @@ org.apache.tez tez-mapreduce - ${tez.version} test org.apache.tez tez-dag - ${tez.version} test @@ -438,32 +393,27 @@ org.apache.hadoop hadoop-yarn-server-tests - ${hadoop.version} test tests org.apache.hadoop hadoop-yarn-client - ${hadoop.version} test org.apache.hadoop hadoop-yarn-common - ${hadoop.version} test org.apache.hadoop hadoop-yarn-api - ${hadoop.version} test org.apache.hadoop hadoop-yarn-registry - ${hadoop.version} true @@ -578,7 +528,6 @@ org.apache.maven.plugins maven-jar-plugin - ${maven.jar.plugin.version} diff --git a/itests/pom.xml b/itests/pom.xml index 233c30f18a..6d8bf97d72 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -55,11 +55,22 @@ hive-common ${project.version} + + org.apache.hive + hive-common + ${project.version} + tests + org.apache.hive hive-contrib ${project.version} + + org.apache.hive + hive-metastore + ${project.version} + org.apache.hive hive-standalone-metastore-common @@ -82,6 +93,64 @@ ${project.version} tests + + org.apache.hive + hive-cli + ${project.version} + + + org.apache.hive + hive-streaming + ${project.version} + + + org.apache.hive + hive-accumulo-handler + ${project.version} + + + org.apache.hive + hive-accumulo-handler + ${project.version} + tests + + + org.apache.hive.hcatalog + hive-hcatalog-core + ${project.version} + + + org.apache.hive.hcatalog + hive-hcatalog-core + tests + ${project.version} + + + org.apache.hive.hcatalog + hive-hcatalog-streaming + ${project.version} + + + org.apache.hive.hcatalog + hive-hcatalog-pig-adapter + ${project.version} + + + org.apache.hive.hcatalog + hive-hcatalog-server-extensions + ${project.version} + + + org.apache.hive.hcatalog + hive-webhcat-java-client + ${project.version} + tests + + + org.apache.hive.hcatalog + hive-webhcat-java-client + ${project.version} + org.apache.hive hive-it-custom-serde @@ -98,6 +167,11 @@ ${project.version} tests + + org.apache.hive + hive-beeline + ${project.version} + org.apache.hive hive-serde @@ -114,6 +188,23 @@ ${project.version} tests + + org.apache.hive + hive-exec + ${project.version} + core + + + org.apache.hive + hive-service + ${project.version} + + + org.apache.hive + hive-service + ${project.version} + tests + org.apache.hive hive-it-util @@ -135,11 +226,27 @@ hive-it-druid ${project.version} + + org.apache.hive + hive-hbase-handler + ${project.version} + + + org.apache.hive + hive-hbase-handler + ${project.version} + tests + org.apache.hive hive-jdbc-handler ${project.version} + + org.apache.hive + hive-jdbc + ${project.version} + org.apache.hive kafka-handler @@ -156,6 +263,22 @@ ${project.version} tests + + org.apache.hive + hive-llap-ext-client + ${project.version} + + + org.apache.hive + hive-kudu-handler + ${project.version} + + + org.apache.hive + hive-kudu-handler + ${project.version} + tests + org.apache.hadoop hadoop-common @@ -167,11 +290,21 @@ ${hadoop.version} tests + + org.apache.hadoop + hadoop-annotations + ${hadoop.version} + org.apache.hadoop hadoop-distcp ${hadoop.version} + + org.apache.hadoop + hadoop-aws + ${hadoop.version} + org.apache.hadoop hadoop-hdfs @@ -236,6 +369,16 @@ ${hbase.version} tests + + org.apache.hbase + hbase-client + ${hbase.version} + + + org.apache.hbase + hbase-procedure + ${hbase.version} + org.apache.hbase hbase-hadoop-compat @@ -263,11 +406,23 @@ hbase-server ${hbase.version} + + org.apache.hbase + hbase-server + ${hbase.version} + tests + org.apache.hbase hbase-mapreduce ${hbase.version} + + org.apache.hbase + hbase-mapreduce + ${hbase.version} + tests + org.apache.tez tez-tests @@ -284,6 +439,11 @@ tez-runtime-library ${tez.version} + + org.apache.tez + tez-runtime-internals + ${tez.version} + org.apache.tez tez-mapreduce diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 49ae58bf42..825fd3bcf9 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -50,13 +50,11 @@ org.apache.hive hive-common - ${project.version} test org.apache.hive hive-contrib - ${project.version} test @@ -68,39 +66,33 @@ org.apache.hive hive-standalone-metastore-common - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} tests test org.apache.hive hive-standalone-metastore-server - ${project.version} test org.apache.hive hive-standalone-metastore-server - ${project.version} tests test org.apache.hive hive-it-custom-serde - ${project.version} test org.apache.hive hive-it-util - ${project.version} test @@ -116,35 +108,30 @@ org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-exec - ${project.version} test core org.apache.hive hive-exec - ${project.version} test tests org.apache.hive hive-exec - ${project.version} - test-jar + tests test junit junit - ${junit.version} test diff --git a/itests/qtest-kudu/pom.xml b/itests/qtest-kudu/pom.xml index 766db3adca..a7e60e160a 100644 --- a/itests/qtest-kudu/pom.xml +++ b/itests/qtest-kudu/pom.xml @@ -39,13 +39,11 @@ org.apache.hive hive-common - ${project.version} test org.apache.hive hive-contrib - ${project.version} test @@ -57,39 +55,33 @@ org.apache.hive hive-standalone-metastore-common - ${project.version} test org.apache.hive hive-standalone-metastore-common - ${project.version} tests test org.apache.hive hive-standalone-metastore-server - ${project.version} test org.apache.hive hive-standalone-metastore-server - ${project.version} tests test org.apache.hive hive-it-custom-serde - ${project.version} test org.apache.hive hive-it-util - ${project.version} test @@ -105,20 +97,17 @@ org.apache.hive hive-serde - ${project.version} test org.apache.hive hive-exec - ${project.version} test core org.apache.hive hive-exec - ${project.version} test tests @@ -126,7 +115,6 @@ junit junit - ${junit.version} test org.apache.hadoop hadoop-common - ${hadoop.version} true diff --git a/itests/util/pom.xml b/itests/util/pom.xml index bc14d1821f..2504a6d420 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -55,55 +55,45 @@ org.apache.hive hive-accumulo-handler - ${project.version} org.apache.hive hive-accumulo-handler - ${project.version} tests org.apache.hive hive-common - ${project.version} org.apache.hive hive-cli - ${project.version} org.apache.hive hive-beeline - ${project.version} org.apache.hive hive-hbase-handler - ${project.version} org.apache.hive hive-hbase-handler - ${project.version} tests org.apache.hive hive-kudu-handler - ${project.version} org.apache.hive hive-kudu-handler - ${project.version} tests org.apache.hive hive-metastore - ${project.version} guice @@ -114,41 +104,34 @@ org.apache.hive hive-exec - ${project.version} org.apache.hive hive-exec - ${project.version} tests org.apache.hive hive-standalone-metastore-common - ${project.version} - test-jar + tests org.apache.hive hive-standalone-metastore-server - ${project.version} - test-jar + tests org.apache.hive hive-llap-server - ${project.version} org.apache.hive hive-llap-server - ${project.version} - test-jar + tests org.apache.hadoop hadoop-common - ${hadoop.version} guice @@ -159,7 +142,6 @@ org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} guice @@ -170,17 +152,14 @@ org.apache.hbase hbase-client - ${hbase.version} org.apache.hbase hbase-common - ${hbase.version} org.apache.hbase hbase-server - ${hbase.version} org.glassfish.web @@ -191,7 +170,6 @@ org.apache.hbase hbase-mapreduce - ${hbase.version} org.apache.kudu @@ -201,24 +179,20 @@ org.apache.tez tez-api - ${tez.version} junit junit - ${junit.version} org.apache.hadoop hadoop-hdfs - ${hadoop.version} tests org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} tests @@ -234,25 +208,21 @@ org.apache.hbase hbase-common - ${hbase.version} tests org.apache.hbase hbase-server - ${hbase.version} tests org.apache.hbase hbase-mapreduce - ${hbase.version} tests org.apache.hive hive-it-druid - ${project.version} com.sun.jersey diff --git a/pom.xml b/pom.xml index 59545feefd..3ef595cb19 100644 --- a/pom.xml +++ b/pom.xml @@ -448,6 +448,26 @@ kahadb ${activemq.version} + + org.apache.calcite.avatica + avatica + ${avatica.version} + + + org.apache.calcite.avatica + avatica-core + ${avatica.version} + + + org.apache.calcite.avatica + avatica-metrics + ${avatica.version} + + + org.apache.calcite.avatica + avatica-server + ${avatica.version} + org.apache.avro avro @@ -646,6 +666,11 @@ jetty-webapp ${jetty.version} + + org.eclipse.jetty + jetty-util + ${jetty.version} + javax.servlet javax.servlet-api diff --git a/serde/pom.xml b/serde/pom.xml index 373cce9d41..9f1b146d02 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -58,7 +58,6 @@ commons-codec commons-codec - ${commons-codec.version} org.apache.arrow @@ -78,12 +77,10 @@ org.apache.avro avro - ${avro.version} org.apache.thrift libthrift - ${libthrift.version} net.sf.opencsv @@ -98,7 +95,6 @@ org.apache.hadoop hadoop-common - ${hadoop.version} true @@ -118,7 +114,6 @@ org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} true @@ -126,19 +121,16 @@ com.google.code.tempus-fugit tempus-fugit - ${tempus-fugit.version} test junit junit - ${junit.version} test com.sun.jersey jersey-servlet - ${jersey.version} test @@ -171,7 +163,6 @@ org.apache.hadoop hadoop-hdfs - ${hadoop.version} test diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 46109c0bb0..61fdaf0810 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -121,9 +121,9 @@ test - commons-logging - commons-logging - ${commons-logging.version} + org.slf4j + slf4j-simple + ${slf4j.version} test @@ -158,7 +158,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 1.8 1.8 @@ -167,17 +166,14 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 org.apache.maven.plugins maven-surefire-plugin - 2.19.1 false -Xmx2048m diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml index 1ec720f4b7..8f3abba06d 100644 --- a/upgrade-acid/pom.xml +++ b/upgrade-acid/pom.xml @@ -58,6 +58,7 @@ org.apache.maven.plugins maven-checkstyle-plugin + ${maven.checkstyle.plugin.version} ${checkstyle.conf.dir}/checkstyle.xml config_loc=${checkstyle.conf.dir}