Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 3f99bbdb3 -> e3aaa7fb7
SENTRY-1636: Remove thrift dependency on fb303 (Alex Kolbasov, Reviewed by: Vamsee Yarlagadda) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/e3aaa7fb Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/e3aaa7fb Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/e3aaa7fb Branch: refs/heads/sentry-ha-redesign Commit: e3aaa7fb73a1e83af37424b51403f6e28cd0cd22 Parents: 3f99bbd Author: Alexander Kolbasov <[email protected]> Authored: Tue Feb 21 11:13:32 2017 -0600 Committer: Alexander Kolbasov <[email protected]> Committed: Tue Feb 21 11:13:32 2017 -0600 ---------------------------------------------------------------------- pom.xml | 6 ------ .../src/main/resources/sentry_hdfs_service.thrift | 2 -- sentry-hdfs/sentry-hdfs-service/pom.xml | 4 ---- sentry-provider/sentry-provider-db/pom.xml | 4 ---- .../src/main/resources/sentry_common_service.thrift | 2 -- .../src/main/resources/sentry_generic_policy_service.thrift | 1 - .../src/main/resources/sentry_policy_service.thrift | 1 - .../org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java | 1 - 8 files changed, 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0d89bee..bdee67f 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,6 @@ limitations under the License. <jettyVersion>8.1.19.v20160209</jettyVersion> <joda-time.version>2.5</joda-time.version> <junit.version>4.10</junit.version> - <libfb303.version>0.9.3</libfb303.version> <libthrift.version>0.9.3</libthrift.version> <log4j.version>1.2.16</log4j.version> <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version> @@ -137,11 +136,6 @@ limitations under the License. <version>${libthrift.version}</version> </dependency> <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libfb303</artifactId> - <version>${libfb303.version}</version> - </dependency> - <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-common</artifactId> <version>${hive.version}</version> http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-hdfs/sentry-hdfs-common/src/main/resources/sentry_hdfs_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-common/src/main/resources/sentry_hdfs_service.thrift b/sentry-hdfs/sentry-hdfs-common/src/main/resources/sentry_hdfs_service.thrift index 5f9cf31..d01841b 100644 --- a/sentry-hdfs/sentry-hdfs-common/src/main/resources/sentry_hdfs_service.thrift +++ b/sentry-hdfs/sentry-hdfs-common/src/main/resources/sentry_hdfs_service.thrift @@ -22,8 +22,6 @@ # Thrift Service that the MetaStore is built on # -#include "share/fb303/if/fb303.thrift" - namespace java org.apache.sentry.hdfs.service.thrift namespace php sentry.hdfs.thrift namespace cpp Apache.Sentry.HDFS.Thrift http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-hdfs/sentry-hdfs-service/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-hdfs/sentry-hdfs-service/pom.xml b/sentry-hdfs/sentry-hdfs-service/pom.xml index 038d2af..4d8c76d 100644 --- a/sentry-hdfs/sentry-hdfs-service/pom.xml +++ b/sentry-hdfs/sentry-hdfs-service/pom.xml @@ -87,10 +87,6 @@ limitations under the License. </dependency> <dependency> <groupId>org.apache.thrift</groupId> - <artifactId>libfb303</artifactId> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/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 54cc026..a0ab56e 100644 --- a/sentry-provider/sentry-provider-db/pom.xml +++ b/sentry-provider/sentry-provider-db/pom.xml @@ -145,10 +145,6 @@ limitations under the License. </dependency> <dependency> <groupId>org.apache.thrift</groupId> - <artifactId>libfb303</artifactId> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-provider/sentry-provider-db/src/main/resources/sentry_common_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry_common_service.thrift b/sentry-provider/sentry-provider-db/src/main/resources/sentry_common_service.thrift index 65c6934..2a92c97 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry_common_service.thrift +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry_common_service.thrift @@ -18,8 +18,6 @@ * limitations under the License. */ -include "share/fb303/if/fb303.thrift" - namespace java org.apache.sentry.service.thrift namespace php sentry.service.thrift namespace cpp Apache.Sentry.Service.Thrift http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-provider/sentry-provider-db/src/main/resources/sentry_generic_policy_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry_generic_policy_service.thrift b/sentry-provider/sentry-provider-db/src/main/resources/sentry_generic_policy_service.thrift index db107bf..c56522f 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry_generic_policy_service.thrift +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry_generic_policy_service.thrift @@ -22,7 +22,6 @@ # Thrift Service that the MetaStore is built on # -include "share/fb303/if/fb303.thrift" include "sentry_common_service.thrift" include "sentry_policy_service.thrift" http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift b/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift index 82cd947..4075e3a 100644 --- a/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift +++ b/sentry-provider/sentry-provider-db/src/main/resources/sentry_policy_service.thrift @@ -22,7 +22,6 @@ # Thrift Service that the MetaStore is built on # -include "share/fb303/if/fb303.thrift" include "sentry_common_service.thrift" namespace java org.apache.sentry.provider.db.service.thrift http://git-wip-us.apache.org/repos/asf/sentry/blob/e3aaa7fb/sentry-tests/sentry-tests-sqoop/src/test/java/org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-sqoop/src/test/java/org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java b/sentry-tests/sentry-tests-sqoop/src/test/java/org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java index cea9acc..3817cba 100644 --- a/sentry-tests/sentry-tests-sqoop/src/test/java/org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java +++ b/sentry-tests/sentry-tests-sqoop/src/test/java/org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java @@ -280,7 +280,6 @@ public class TomcatSqoopRunner { jar.contains("tdgs") || // Teradata driver jar.contains("nzjdbc") || // Netezza driver jar.contains("sqljdbc") || // Microsoft SQL Server driver - jar.contains("libfb303") || // Facebook thrift lib jar.contains("datanucleus-") || // Data nucleus libs jar.contains("google") // Google libraries (guava, ...) ) {
