SENTRY-1849: Fix the pom file to use appropriate hive dependencies based on hive-authz profile (kalyan kumar kalvagadda Reviewed by: Colm O hEigeartaigh, Sergio Pena)
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/5b7ccccc Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/5b7ccccc Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/5b7ccccc Branch: refs/heads/master Commit: 5b7cccccf245252e1f972f360e3fba294b102a01 Parents: 073b9e9 Author: Kalyan Kumar Kalvagadda <[email protected]> Authored: Tue Jul 18 18:23:39 2017 -0500 Committer: Kalyan Kumar Kalvagadda <[email protected]> Committed: Wed Jul 19 07:09:56 2017 -0500 ---------------------------------------------------------------------- pom.xml | 304 +++++++++++++------ .../sentry-binding-hive-common/pom.xml | 2 + sentry-binding/sentry-binding-hive-conf/pom.xml | 2 + .../sentry-binding-hive-follower/pom.xml | 1 + sentry-binding/sentry-binding-hive-v2/pom.xml | 12 +- sentry-binding/sentry-binding-hive/pom.xml | 2 + sentry-hdfs/sentry-hdfs-common/pom.xml | 1 + sentry-hdfs/sentry-hdfs-dist/pom.xml | 4 - sentry-provider/sentry-provider-db/pom.xml | 29 +- .../service/thrift/NotificationProcessor.java | 2 - sentry-tests/sentry-tests-hive-v2/pom.xml | 26 +- sentry-tests/sentry-tests-hive/pom.xml | 12 + 12 files changed, 257 insertions(+), 140 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2c109a4..5a06a41 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,6 @@ limitations under the License. <guava.version>11.0.2</guava.version> <hadoop.version>2.7.2</hadoop.version> <hamcrest.version>1.3</hamcrest.version> - <hive-v2.version>2.0.0</hive-v2.version> <hive.version>1.1.0</hive.version> <jackson.version>1.8.8</jackson.version> <jdo-api.version>3.0.1</jdo-api.version> @@ -139,21 +138,6 @@ limitations under the License. <version>${libthrift.version}</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-core</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-pig-adapter</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> @@ -206,12 +190,6 @@ limitations under the License. <version>${hadoop.version}</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - <version>${hive.version}</version> - </dependency> - - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> <version>${jackson.version}</version> @@ -221,34 +199,6 @@ limitations under the License. <artifactId>jackson-mapper-asl</artifactId> <version>${jackson.version}</version> </dependency> - - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-beeline</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-serde</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-serde</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hive</groupId> - <artifactId>hive-shims</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.sentry</groupId> <artifactId>solr-sentry-core</artifactId> @@ -340,52 +290,6 @@ limitations under the License. <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-jdbc</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-shims</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-serde</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-exec</artifactId> - <version>${hive.version}</version> - <exclusions> - <exclusion> - <artifactId>apache-curator</artifactId> - <groupId>org.apache.curator</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-service</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-hbase-handler</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-contrib</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-cli</artifactId> - <version>${hive.version}</version> - </dependency> - <dependency> <groupId>org.apache.sentry</groupId> <artifactId>sentry-binding-hive-common</artifactId> <version>${project.version}</version> @@ -895,6 +799,214 @@ limitations under the License. <profiles> <profile> + <id>hive-authz1</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <hive.version>1.1.0</hive.version> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-core</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-pig-adapter</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-beeline</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-shims</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-jdbc</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-shims</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>apache-curator</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-service</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-hbase-handler</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-contrib</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-cli</artifactId> + <version>${hive.version}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>hive-authz2</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <hive.version>2.0.0</hive.version> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-core</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive.hcatalog</groupId> + <artifactId>hive-hcatalog-pig-adapter</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-beeline</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-metastore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-common</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.hive</groupId> + <artifactId>hive-shims</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-jdbc</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-shims</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-serde</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-exec</artifactId> + <version>${hive.version}</version> + <exclusions> + <exclusion> + <artifactId>apache-curator</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-service</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-hbase-handler</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-contrib</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-cli</artifactId> + <version>${hive.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>nochecks</id> <properties> <pmd.skip>true</pmd.skip> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-binding/sentry-binding-hive-common/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-common/pom.xml b/sentry-binding/sentry-binding-hive-common/pom.xml index f48c625..5d42b28 100644 --- a/sentry-binding/sentry-binding-hive-common/pom.xml +++ b/sentry-binding/sentry-binding-hive-common/pom.xml @@ -45,11 +45,13 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-binding/sentry-binding-hive-conf/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-conf/pom.xml b/sentry-binding/sentry-binding-hive-conf/pom.xml index 8539f5b..69858f6 100644 --- a/sentry-binding/sentry-binding-hive-conf/pom.xml +++ b/sentry-binding/sentry-binding-hive-conf/pom.xml @@ -46,11 +46,13 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-binding/sentry-binding-hive-follower/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-follower/pom.xml b/sentry-binding/sentry-binding-hive-follower/pom.xml index f9f57ad..e69519c 100644 --- a/sentry-binding/sentry-binding-hive-follower/pom.xml +++ b/sentry-binding/sentry-binding-hive-follower/pom.xml @@ -59,6 +59,7 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-binding/sentry-binding-hive-v2/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-v2/pom.xml b/sentry-binding/sentry-binding-hive-v2/pom.xml index eafc0ad..5f5cbf3 100644 --- a/sentry-binding/sentry-binding-hive-v2/pom.xml +++ b/sentry-binding/sentry-binding-hive-v2/pom.xml @@ -76,37 +76,37 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-shims</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-binding/sentry-binding-hive/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive/pom.xml b/sentry-binding/sentry-binding-hive/pom.xml index 02c8ac1..92147e1 100644 --- a/sentry-binding/sentry-binding-hive/pom.xml +++ b/sentry-binding/sentry-binding-hive/pom.xml @@ -59,11 +59,13 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.sentry</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-hdfs/sentry-hdfs-common/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-common/pom.xml b/sentry-hdfs/sentry-hdfs-common/pom.xml index 96f5f81..e593bba 100644 --- a/sentry-hdfs/sentry-hdfs-common/pom.xml +++ b/sentry-hdfs/sentry-hdfs-common/pom.xml @@ -48,6 +48,7 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-hdfs/sentry-hdfs-dist/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-dist/pom.xml b/sentry-hdfs/sentry-hdfs-dist/pom.xml index 4674fc0..bfae12b 100644 --- a/sentry-hdfs/sentry-hdfs-dist/pom.xml +++ b/sentry-hdfs/sentry-hdfs-dist/pom.xml @@ -49,10 +49,6 @@ limitations under the License. <groupId>org.apache.sentry</groupId> <artifactId>sentry-core-common</artifactId> </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-core-common</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-provider/sentry-provider-db/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/pom.xml b/sentry-provider/sentry-provider-db/pom.xml index 12f50f9..7b13cea 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -125,27 +125,25 @@ limitations under the License. <artifactId>sentry-hdfs-common</artifactId> </dependency> <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-binding-hive-conf</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.sentry</groupId> - <artifactId>sentry-binding-hive-follower</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-shims</artifactId> <scope>provided</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> + <version>${hive.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-service</artifactId> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-server-extensions</artifactId> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.thrift</groupId> @@ -219,19 +217,12 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-metastore</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hive.hcatalog</groupId> - <artifactId>hive-hcatalog-server-extensions</artifactId> - <version>RELEASE</version> + <version>${hive.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/NotificationProcessor.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/NotificationProcessor.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/NotificationProcessor.java index 3a5ba46..62fde2c 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/NotificationProcessor.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/NotificationProcessor.java @@ -195,8 +195,6 @@ final class NotificationProcessor { return processDropPartition(event); case ALTER_PARTITION: return processAlterPartition(event); - case INSERT: - return false; default: LOGGER.error("Notification with ID:{} has invalid event type: {}", event.getEventId(), event.getEventType()); http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-tests/sentry-tests-hive-v2/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive-v2/pom.xml b/sentry-tests/sentry-tests-hive-v2/pom.xml index d648ba4..abb293d 100644 --- a/sentry-tests/sentry-tests-hive-v2/pom.xml +++ b/sentry-tests/sentry-tests-hive-v2/pom.xml @@ -56,7 +56,7 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <exclusions> <exclusion> <groupId>ant</groupId> @@ -68,13 +68,13 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-shims</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> @@ -90,19 +90,19 @@ limitations under the License. <artifactId>datanucleus-rdbms</artifactId> </exclusion> </exclusions> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-hbase-handler</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> @@ -118,43 +118,43 @@ limitations under the License. <artifactId>datanucleus-rdbms</artifactId> </exclusion> </exclusions> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-pig-adapter</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-beeline</artifactId> - <version>${hive-v2.version}</version> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/5b7ccccc/sentry-tests/sentry-tests-hive/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/pom.xml b/sentry-tests/sentry-tests-hive/pom.xml index da75abd..51801dc 100644 --- a/sentry-tests/sentry-tests-hive/pom.xml +++ b/sentry-tests/sentry-tests-hive/pom.xml @@ -47,20 +47,24 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-service</artifactId> <scope>test</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-shims</artifactId> <scope>test</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-serde</artifactId> <scope>test</scope> + <version>${hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> + <version>${hive.version}</version> <exclusions> <exclusion> <groupId>org.datanucleus</groupId> @@ -76,16 +80,19 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-jdbc</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-hbase-handler</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> + <version>${hive.version}</version> <exclusions> <exclusion> <groupId>org.datanucleus</groupId> @@ -101,16 +108,19 @@ limitations under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-contrib</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-cli</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> @@ -122,11 +132,13 @@ limitations under the License. <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-pig-adapter</artifactId> + <version>${hive.version}</version> <scope>test</scope> </dependency> <dependency>
