Repository: sentry Updated Branches: refs/heads/master 322c281af -> 797740292
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/79774029 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/79774029 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/79774029 Branch: refs/heads/master Commit: 797740292164b0200dc620f0d198aa039b68ca6a Parents: 322c281 Author: Alexander Kolbasov <[email protected]> Authored: Tue Feb 21 11:04:39 2017 -0600 Committer: Alexander Kolbasov <[email protected]> Committed: Tue Feb 21 11:04:39 2017 -0600 ---------------------------------------------------------------------- .../src/main/resources/sentry_hdfs_service.thrift | 2 -- sentry-hdfs/sentry-hdfs-service/pom.xml | 4 ---- sentry-service/sentry-service-common/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 - sentry-service/sentry-service-server/pom.xml | 4 ---- .../org/apache/sentry/tests/e2e/sqoop/TomcatSqoopRunner.java | 1 - 8 files changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/79774029/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/79774029/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 b890dd5..89a848a 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/79774029/sentry-service/sentry-service-common/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-common/pom.xml b/sentry-service/sentry-service-common/pom.xml index bac8c65..c32fc7e 100644 --- a/sentry-service/sentry-service-common/pom.xml +++ b/sentry-service/sentry-service-common/pom.xml @@ -42,10 +42,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/79774029/sentry-service/sentry-service-common/src/main/resources/sentry_common_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-common/src/main/resources/sentry_common_service.thrift b/sentry-service/sentry-service-common/src/main/resources/sentry_common_service.thrift index 65c6934..2a92c97 100644 --- a/sentry-service/sentry-service-common/src/main/resources/sentry_common_service.thrift +++ b/sentry-service/sentry-service-common/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/79774029/sentry-service/sentry-service-common/src/main/resources/sentry_generic_policy_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-common/src/main/resources/sentry_generic_policy_service.thrift b/sentry-service/sentry-service-common/src/main/resources/sentry_generic_policy_service.thrift index db107bf..c56522f 100644 --- a/sentry-service/sentry-service-common/src/main/resources/sentry_generic_policy_service.thrift +++ b/sentry-service/sentry-service-common/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/79774029/sentry-service/sentry-service-common/src/main/resources/sentry_policy_service.thrift ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-common/src/main/resources/sentry_policy_service.thrift b/sentry-service/sentry-service-common/src/main/resources/sentry_policy_service.thrift index 82cd947..4075e3a 100644 --- a/sentry-service/sentry-service-common/src/main/resources/sentry_policy_service.thrift +++ b/sentry-service/sentry-service-common/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/79774029/sentry-service/sentry-service-server/pom.xml ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-server/pom.xml b/sentry-service/sentry-service-server/pom.xml index e8098be..3a3303d 100644 --- a/sentry-service/sentry-service-server/pom.xml +++ b/sentry-service/sentry-service-server/pom.xml @@ -46,10 +46,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/79774029/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, ...) ) {
