Repository: incubator-sentry Updated Branches: refs/heads/master 4da9dc22e -> 4a5c9c2c9
SENTRY-684: Upgrade to Apache Curator 2.7.1 (Dapeng Sun, reviewed by Guoquan Shen) Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/4a5c9c2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/4a5c9c2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/4a5c9c2c Branch: refs/heads/master Commit: 4a5c9c2c9052e6e87ccab39c9f9a73468407b188 Parents: 4da9dc2 Author: Sun Dapeng <[email protected]> Authored: Mon Jul 27 09:26:18 2015 +0800 Committer: Sun Dapeng <[email protected]> Committed: Mon Jul 27 09:26:27 2015 +0800 ---------------------------------------------------------------------- pom.xml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/4a5c9c2c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 839eb1d..b5f6e8a 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ limitations under the License. <junit.version>4.9</junit.version> <libthrift.version>0.9.2</libthrift.version> <libfb303.version>0.9.2</libfb303.version> - <curator.version>2.6.0</curator.version> + <curator.version>2.7.1</curator.version> <junit.version>4.10</junit.version> <log4j.version>1.2.16</log4j.version> <mockito.version>1.8.5</mockito.version> @@ -87,7 +87,6 @@ limitations under the License. <jackson.version>1.8.8</jackson.version> <metrics.version>3.1.0</metrics.version> <jettyVersion>7.6.16.v20140903</jettyVersion> - <curator.version>2.6.0</curator.version> <joda-time.version>2.5</joda-time.version> <test.sentry.hadoop.classpath>${maven.test.classpath}</test.sentry.hadoop.classpath> <easymock.version>3.0</easymock.version> @@ -158,6 +157,16 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <artifactId>curator-client</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + <exclusion> + <artifactId>curator-framework</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -174,6 +183,12 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <artifactId>curator-client</artifactId> + <groupId>org.apache.curator</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -333,6 +348,12 @@ limitations under the License. <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>
