Repository: sentry Updated Branches: refs/heads/master d4172ba9f -> b107cae11
SENTRY-1943: Update Guava to 14.0 (Sergio Pena, reviewed by Alexander Kolbasov) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/b107cae1 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/b107cae1 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/b107cae1 Branch: refs/heads/master Commit: b107cae11cf3bbb676ac84f98a4120e51b159b41 Parents: d4172ba Author: Sergio Pena <[email protected]> Authored: Tue Sep 19 09:52:53 2017 -0500 Committer: Sergio Pena <[email protected]> Committed: Tue Sep 19 09:52:53 2017 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- .../main/java/org/apache/sentry/policy/common/PolicyEngine.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/b107cae1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1479f5f..fd876a1 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ limitations under the License. <derby.version>10.10.2.0</derby.version> <easymock.version>3.0</easymock.version> <fest.reflect.version>1.4.1</fest.reflect.version> - <guava.version>11.0.2</guava.version> + <guava.version>14.0.1</guava.version> <hadoop.version>2.7.2</hadoop.version> <hamcrest.version>1.3</hamcrest.version> <hive.version>1.1.0</hive.version> http://git-wip-us.apache.org/repos/asf/sentry/blob/b107cae1/sentry-policy/sentry-policy-common/src/main/java/org/apache/sentry/policy/common/PolicyEngine.java ---------------------------------------------------------------------- diff --git a/sentry-policy/sentry-policy-common/src/main/java/org/apache/sentry/policy/common/PolicyEngine.java b/sentry-policy/sentry-policy-common/src/main/java/org/apache/sentry/policy/common/PolicyEngine.java index 2396c97..504b5ea 100644 --- a/sentry-policy/sentry-policy-common/src/main/java/org/apache/sentry/policy/common/PolicyEngine.java +++ b/sentry-policy/sentry-policy-common/src/main/java/org/apache/sentry/policy/common/PolicyEngine.java @@ -19,8 +19,8 @@ package org.apache.sentry.policy.common; import java.util.Set; -import javax.annotation.concurrent.ThreadSafe; +import org.apache.http.annotation.ThreadSafe; import org.apache.sentry.core.common.ActiveRoleSet; import org.apache.sentry.core.common.Authorizable; import org.apache.sentry.core.common.exception.SentryConfigurationException;
