This is an automated email from the ASF dual-hosted git repository. dmollitor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push: new 078182a HIVE-22444: Clean up Project POM Files (David Mollitor, reviewed by Miklos Gergely) 078182a is described below commit 078182ade4b76e810ca945354f4897dbe36ad5c2 Author: David Mollitor <dmolli...@apache.org> AuthorDate: Thu Nov 14 09:33:03 2019 -0500 HIVE-22444: Clean up Project POM Files (David Mollitor, reviewed by Miklos Gergely) --- druid-handler/pom.xml | 4 - itests/custom-serde/pom.xml | 6 - itests/custom-udfs/pom.xml | 15 -- itests/custom-udfs/udf-classloader-udf1/pom.xml | 8 ++ itests/custom-udfs/udf-classloader-udf2/pom.xml | 8 ++ .../custom-udfs/udf-vectorized-badexample/pom.xml | 8 ++ itests/hcatalog-unit/pom.xml | 40 +----- itests/hive-blobstore/pom.xml | 57 ++++---- itests/hive-jmh/pom.xml | 8 -- itests/hive-minikdc/pom.xml | 93 +++++++----- itests/hive-unit-hadoop2/pom.xml | 26 +--- itests/hive-unit/pom.xml | 74 ++-------- itests/pom.xml | 160 +++++++++++++++++++++ itests/qtest-accumulo/pom.xml | 39 +---- itests/qtest-druid/pom.xml | 10 +- itests/qtest-kudu/pom.xml | 30 +--- itests/qtest-spark/pom.xml | 33 ----- itests/qtest/pom.xml | 5 + itests/test-serde/pom.xml | 2 - itests/util/pom.xml | 39 +---- kafka-handler/pom.xml | 1 - pom.xml | 41 +++++- ql/pom.xml | 4 - serde/pom.xml | 9 -- storage-api/pom.xml | 10 +- upgrade-acid/pom.xml | 1 + 26 files changed, 342 insertions(+), 389 deletions(-) diff --git a/druid-handler/pom.xml b/druid-handler/pom.xml index 0ae18b6..7d5c3f4 100644 --- a/druid-handler/pom.xml +++ b/druid-handler/pom.xml @@ -178,7 +178,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> - <version>${hadoop.version}</version> <optional>true</optional> <exclusions> <exclusion> @@ -203,7 +202,6 @@ <groupId>org.apache.hadoop</groupId> <scope>provided</scope> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> <exclusions> <exclusion> @@ -240,7 +238,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -279,7 +276,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven.shade.plugin.version}</version> <executions> <!-- we need to shade netty, as there is a conflict between versions used by Hadoop (3.6.2.Final) and Druid (3.10.4.Final) --> diff --git a/itests/custom-serde/pom.xml b/itests/custom-serde/pom.xml index f204a85..db50220 100644 --- a/itests/custom-serde/pom.xml +++ b/itests/custom-serde/pom.xml @@ -36,19 +36,13 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <optional>true</optional> </dependency> <!-- inter-project --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> </dependency> </dependencies> - - <profiles> - </profiles> - </project> diff --git a/itests/custom-udfs/pom.xml b/itests/custom-udfs/pom.xml index 9955b04..5324b41 100644 --- a/itests/custom-udfs/pom.xml +++ b/itests/custom-udfs/pom.xml @@ -45,19 +45,4 @@ limitations under the License. <module>udf-vectorized-badexample</module> </modules> - <dependencies> - <!-- intra-project --> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-exec</artifactId> - <version>${project.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - <optional>true</optional> - </dependency> - </dependencies> </project> diff --git a/itests/custom-udfs/udf-classloader-udf1/pom.xml b/itests/custom-udfs/udf-classloader-udf1/pom.xml index d3ec376..b7cfd64 100644 --- a/itests/custom-udfs/udf-classloader-udf1/pom.xml +++ b/itests/custom-udfs/udf-classloader-udf1/pom.xml @@ -34,6 +34,14 @@ <artifactId>udf-classloader-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </dependency> </dependencies> <properties> diff --git a/itests/custom-udfs/udf-classloader-udf2/pom.xml b/itests/custom-udfs/udf-classloader-udf2/pom.xml index 4e5dee8..7b3707a 100644 --- a/itests/custom-udfs/udf-classloader-udf2/pom.xml +++ b/itests/custom-udfs/udf-classloader-udf2/pom.xml @@ -34,6 +34,14 @@ <artifactId>udf-classloader-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </dependency> </dependencies> <properties> diff --git a/itests/custom-udfs/udf-vectorized-badexample/pom.xml b/itests/custom-udfs/udf-vectorized-badexample/pom.xml index d4b278d..444870e 100644 --- a/itests/custom-udfs/udf-vectorized-badexample/pom.xml +++ b/itests/custom-udfs/udf-vectorized-badexample/pom.xml @@ -34,6 +34,14 @@ <artifactId>udf-classloader-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </dependency> </dependencies> <properties> diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index ad59ebb..dd55130 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -43,106 +43,89 @@ <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-pig-adapter</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-server-extensions</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-webhcat-java-client</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-webhcat-java-client</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-hbase-handler</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <!-- test inter-project --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>${commons-io.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -158,7 +141,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -175,26 +157,22 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -211,19 +189,16 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -239,52 +214,44 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -296,13 +263,11 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> @@ -334,8 +299,7 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> </dependencies> diff --git a/itests/hive-blobstore/pom.xml b/itests/hive-blobstore/pom.xml index 83c26da..efc6b37 100644 --- a/itests/hive-blobstore/pom.xml +++ b/itests/hive-blobstore/pom.xml @@ -37,72 +37,77 @@ <execute.beeline.tests>false</execute.beeline.tests> <active.hadoop.version>${hadoop.version}</active.hadoop.version> <test.dfs.mkdir>-mkdir -p</test.dfs.mkdir> + + <!-- Required by Calcite Avatica --> + <protobuf.version>3.3.0</protobuf.version> </properties> <dependencies> <!-- dependencies are always listed in sorted order by groupId, artifactId --> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + </dependency> + <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-unit</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-it-util</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -118,7 +123,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -135,7 +139,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -152,13 +155,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -174,19 +175,16 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-tests</artifactId> - <version>${tez.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-library</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -202,13 +200,11 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -224,13 +220,11 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-aws</artifactId> - <version>${hadoop.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -246,17 +240,27 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> </dependency> </dependencies> @@ -315,7 +319,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>${maven.build-helper.plugin.version}</version> <executions> <execution> <id>add-test-sources</id> diff --git a/itests/hive-jmh/pom.xml b/itests/hive-jmh/pom.xml index 8df370e..0939978 100644 --- a/itests/hive-jmh/pom.xml +++ b/itests/hive-jmh/pom.xml @@ -51,17 +51,14 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-internals</artifactId> - <version>${tez.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> @@ -71,23 +68,19 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> </dependency> </dependencies> @@ -96,7 +89,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.2</version> <executions> <execution> <phase>package</phase> diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 5f675cc..f1328aa 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -30,110 +30,120 @@ <properties> <hive.path.to.root>../..</hive.path.to.root> <exclude.tests>None</exclude.tests> + + <!-- Required by Calcite Avatica --> + <protobuf.version>3.3.0</protobuf.version> </properties> <dependencies> <!-- dependencies are always listed in sorted order by groupId, artifectId --> - <!-- test intra-project --> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-linq4j</artifactId> + </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-unit</artifactId> - <version>${project.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-it-druid</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-unit</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-it-druid</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -150,40 +160,35 @@ </exclusion> </exclusions> </dependency> - <!-- test inter-project --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -200,13 +205,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minikdc</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -222,7 +225,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -234,7 +236,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> @@ -257,12 +258,32 @@ <artifactId>jersey-servlet</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-rewrite</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> </dependencies> <profiles> <profile> <activation> - <os> + <os> <family>Windows</family> </os> </activation> diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 8647d87..981c0e4 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -36,27 +36,22 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -78,19 +73,16 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.hive</groupId> @@ -102,45 +94,38 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <!-- test inter-project --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-unit</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> <exclusions> <exclusion> @@ -156,7 +141,6 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-unit</artifactId> - <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -173,24 +157,20 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -207,19 +187,16 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -231,7 +208,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 6d6c8d2..bc20cd6 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -37,73 +37,59 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc-handler</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-llap-server</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-llap-ext-client</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-llap-server</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-streaming</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-streaming</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-server-extensions</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-webhcat-java-client</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.hive</groupId> @@ -111,11 +97,9 @@ </exclusion> </exclusions> </dependency> - <!-- inter-project --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -130,8 +114,7 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-tests</artifactId> - <version>${tez.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -155,81 +138,67 @@ </exclusion> </exclusions> </dependency> - <!-- dependencies are always listed in sorted order by groupId, artifectId --> - <!-- test intra-project --> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-webhcat-java-client</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> + <classifier>tests</classifier> + <scope>test</scope> </dependency> <!-- test inter-project --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -242,7 +211,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -259,19 +227,16 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <exclusions> <exclusion> <groupId>org.glassfish.web</groupId> @@ -282,34 +247,29 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-procedure</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> @@ -335,13 +295,11 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -358,7 +316,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -374,13 +331,11 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-library</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -396,7 +351,6 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-internals</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -412,13 +366,11 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -438,32 +390,27 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-registry</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> </dependency> <dependency> @@ -578,7 +525,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>${maven.jar.plugin.version}</version> <executions> <execution> <goals> diff --git a/itests/pom.xml b/itests/pom.xml index 233c30f..6d8bf97 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -57,11 +57,22 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> <version>${project.version}</version> </dependency> @@ -84,6 +95,64 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-cli</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-streaming</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-accumulo-handler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-accumulo-handler</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-core</artifactId> + <classifier>tests</classifier> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-streaming</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-pig-adapter</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-server-extensions</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-webhcat-java-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-it-custom-serde</artifactId> <version>${project.version}</version> </dependency> @@ -100,6 +169,11 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-beeline</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> <version>${project.version}</version> </dependency> @@ -116,6 +190,23 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${project.version}</version> + <classifier>core</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-service</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-service</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> <version>${project.version}</version> </dependency> @@ -137,11 +228,27 @@ </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-hbase-handler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-hbase-handler</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc-handler</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> + <artifactId>hive-jdbc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> <artifactId>kafka-handler</artifactId> <version>${project.version}</version> </dependency> @@ -157,6 +264,22 @@ <classifier>tests</classifier> </dependency> <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-llap-ext-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-kudu-handler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-kudu-handler</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> @@ -169,11 +292,21 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> <version>${hadoop.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <version>${hadoop.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <version>${hadoop.version}</version> </dependency> @@ -238,6 +371,16 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-client</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-procedure</artifactId> + <version>${hbase.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> <version>${hbase.version}</version> </dependency> @@ -265,10 +408,22 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-server</artifactId> + <version>${hbase.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> <version>${hbase.version}</version> </dependency> <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-mapreduce</artifactId> + <version>${hbase.version}</version> + <classifier>tests</classifier> + </dependency> + <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-tests</artifactId> <version>${tez.version}</version> @@ -286,6 +441,11 @@ </dependency> <dependency> <groupId>org.apache.tez</groupId> + <artifactId>tez-runtime-internals</artifactId> + <version>${tez.version}</version> + </dependency> + <dependency> + <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> <version>${tez.version}</version> </dependency> diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 49ae58b..825fd3b 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -50,13 +50,11 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> - <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -68,39 +66,33 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-custom-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> - <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -116,35 +108,30 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>core</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> <scope>test</scope> </dependency> <!-- inter-project --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <!-- Declare hive-exec dependencies that were shaded in instead of @@ -170,19 +157,16 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -218,7 +202,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -255,20 +238,17 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -285,7 +265,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -301,50 +280,42 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -362,19 +333,16 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-tests</artifactId> - <version>${tez.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-library</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -390,7 +358,6 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -406,7 +373,6 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -526,7 +492,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>${maven.build-helper.plugin.version}</version> <executions> <execution> <id>add-test-sources</id> diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml index e693283..05692c7 100644 --- a/itests/qtest-druid/pom.xml +++ b/itests/qtest-druid/pom.xml @@ -20,13 +20,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>hive-it</artifactId> <groupId>org.apache.hive</groupId> <version>4.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>hive-it-druid</artifactId> @@ -34,7 +35,6 @@ <name>Hive Integration - QFile Druid Tests</name> <!-- dependencies are always listed in sorted order by groupId, artifectId --> - <!-- test intra-project --> <properties> <hive.path.to.root>../..</hive.path.to.root> <druid.curator.version>4.0.0</druid.curator.version> @@ -44,6 +44,7 @@ <druid.guava.version>16.0.1</druid.guava.version> <druid.guice.version>4.1.0</druid.guice.version> <kafka.test.version>2.0.0</kafka.test.version> + <slf4j.version>1.7.25</slf4j.version> </properties> <dependencies> <dependency> @@ -221,11 +222,9 @@ <artifactId>kafka-clients</artifactId> <version>${kafka.test.version}</version> </dependency> - <!-- inter-project --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> </dependency> </dependencies> <build> @@ -235,7 +234,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>${maven.shade.plugin.version}</version> <executions> <!-- Run shade goal on package phase --> <execution> @@ -285,6 +283,4 @@ </plugin> </plugins> </build> - - </project> diff --git a/itests/qtest-kudu/pom.xml b/itests/qtest-kudu/pom.xml index 766db3a..a7e60e1 100644 --- a/itests/qtest-kudu/pom.xml +++ b/itests/qtest-kudu/pom.xml @@ -39,13 +39,11 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> - <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -57,39 +55,33 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-custom-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> - <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -105,20 +97,17 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>core</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> @@ -126,7 +115,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <!-- Declare hive-exec dependencies that were shaded in instead of @@ -152,19 +140,16 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -180,7 +165,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -197,20 +181,17 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -227,7 +208,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -243,20 +223,17 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> @@ -268,19 +245,16 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-tests</artifactId> - <version>${tez.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-runtime-library</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -296,7 +270,6 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -312,7 +285,6 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-dag</artifactId> - <version>${tez.version}</version> <scope>test</scope> <exclusions> <exclusion> diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index 43b087e..ebd7b63 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -110,51 +110,43 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-custom-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-util</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.hive</groupId> @@ -166,13 +158,11 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> @@ -180,19 +170,16 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-archives</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -208,7 +195,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -225,20 +211,17 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <scope>test</scope> <exclusions> @@ -255,7 +238,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-hs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -271,65 +253,55 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-tests</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-hadoop2-compat</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <scope>test</scope> <exclusions> <exclusion> @@ -341,20 +313,17 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -364,7 +333,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> - <version>1.0-alpha-2</version> <executions> <execution> <phase>initialize</phase> @@ -423,7 +391,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>${maven.build-helper.plugin.version}</version> <executions> <execution> <id>add-test-sources</id> diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index 364d07f..109f7a1 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -39,6 +39,7 @@ <clustermode></clustermode> <execute.beeline.tests>false</execute.beeline.tests> <test.dfs.mkdir>-mkdir -p</test.dfs.mkdir> + <slf4j.version>1.7.25</slf4j.version> </properties> <dependencies> @@ -396,6 +397,10 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> <profiles> <profile> diff --git a/itests/test-serde/pom.xml b/itests/test-serde/pom.xml index 3bfc778..d569b28 100644 --- a/itests/test-serde/pom.xml +++ b/itests/test-serde/pom.xml @@ -37,14 +37,12 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <optional>true</optional> </dependency> <!-- inter-project --> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> </dependency> </dependencies> diff --git a/itests/util/pom.xml b/itests/util/pom.xml index bc14d18..ecdeabd 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -32,8 +32,6 @@ </properties> <dependencies> - <!-- dependencies are always listed in sorted order by groupId, artifectId --> - <!-- test intra-project --> <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-minicluster</artifactId> @@ -55,55 +53,45 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-accumulo-handler</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-accumulo-handler</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-hbase-handler</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-hbase-handler</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-kudu-handler</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-kudu-handler</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <artifactId>guice</artifactId> @@ -114,41 +102,34 @@ <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${project.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-common</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-standalone-metastore-server</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-llap-server</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-llap-server</artifactId> - <version>${project.version}</version> - <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <artifactId>guice</artifactId> @@ -159,7 +140,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <exclusions> <exclusion> <artifactId>guice</artifactId> @@ -170,17 +150,14 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> - <version>${hbase.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <exclusions> <exclusion> <groupId>org.glassfish.web</groupId> @@ -191,7 +168,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> </dependency> <dependency> <groupId>org.apache.kudu</groupId> @@ -201,24 +177,19 @@ <dependency> <groupId>org.apache.tez</groupId> <artifactId>tez-api</artifactId> - <version>${tez.version}</version> </dependency> - <!-- test inter-project --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId> - <version>${hadoop.version}</version> <classifier>tests</classifier> <exclusions> <exclusion> @@ -234,25 +205,21 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-mapreduce</artifactId> - <version>${hbase.version}</version> <classifier>tests</classifier> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-it-druid</artifactId> - <version>${project.version}</version> <exclusions> <exclusion> <groupId>com.sun.jersey</groupId> diff --git a/kafka-handler/pom.xml b/kafka-handler/pom.xml index 6c82f82..a66a70a 100644 --- a/kafka-handler/pom.xml +++ b/kafka-handler/pom.xml @@ -84,7 +84,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index cd00934..068d048 100644 --- a/pom.xml +++ b/pom.xml @@ -449,6 +449,26 @@ <version>${activemq.version}</version> </dependency> <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-core</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-metrics</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica-server</artifactId> + <version>${avatica.version}</version> + </dependency> + <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>${avro.version}</version> @@ -484,6 +504,21 @@ <artifactId>stax-api</artifactId> <version>${stax.version}</version> </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-core</artifactId> + <version>${calcite.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-linq4j</artifactId> + <version>${calcite.version}</version> + </dependency> + <dependency> + <groupId>org.apache.calcite</groupId> + <artifactId>calcite-druid</artifactId> + <version>${calcite.version}</version> + </dependency> <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> @@ -647,6 +682,11 @@ <version>${jetty.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>${javax-servlet.version}</version> @@ -967,7 +1007,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.mockito</groupId> diff --git a/ql/pom.xml b/ql/pom.xml index 0d57c25..e5eed46 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -342,7 +342,6 @@ <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-core</artifactId> - <version>${calcite.version}</version> <exclusions> <!-- hsqldb interferes with the use of derby as the default db in hive's use of datanucleus. @@ -376,7 +375,6 @@ <dependency> <groupId>org.apache.calcite</groupId> <artifactId>calcite-druid</artifactId> - <version>${calcite.version}</version> <exclusions> <exclusion> <groupId>org.apache.calcite.avatica</groupId> @@ -387,7 +385,6 @@ <dependency> <groupId>org.apache.calcite.avatica</groupId> <artifactId>avatica</artifactId> - <version>${avatica.version}</version> <exclusions> <exclusion> <groupId>org.apache.calcite.avatica</groupId> @@ -417,7 +414,6 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${guava.version}</version> </dependency> <dependency> <groupId>com.googlecode.javaewah</groupId> diff --git a/serde/pom.xml b/serde/pom.xml index 373cce9..9f1b146 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -58,7 +58,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>${commons-codec.version}</version> </dependency> <dependency> <groupId>org.apache.arrow</groupId> @@ -78,12 +77,10 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>${avro.version}</version> </dependency> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> - <version>${libthrift.version}</version> </dependency> <dependency> <groupId>net.sf.opencsv</groupId> @@ -98,7 +95,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> <exclusions> <exclusion> @@ -118,7 +114,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> - <version>${hadoop.version}</version> <optional>true</optional> </dependency> @@ -126,19 +121,16 @@ <dependency> <groupId>com.google.code.tempus-fugit</groupId> <artifactId>tempus-fugit</artifactId> - <version>${tempus-fugit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> @@ -171,7 +163,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> <exclusions> <exclusion> diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 46109c0..61fdaf0 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -121,9 +121,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -158,7 +158,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -167,17 +166,14 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> <configuration> <reuseForks>false</reuseForks> <argLine>-Xmx2048m</argLine> diff --git a/upgrade-acid/pom.xml b/upgrade-acid/pom.xml index 1ec720f..8f3abba 100644 --- a/upgrade-acid/pom.xml +++ b/upgrade-acid/pom.xml @@ -58,6 +58,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <version>${maven.checkstyle.plugin.version}</version> <configuration> <configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation> <propertyExpansion>config_loc=${checkstyle.conf.dir}</propertyExpansion>