Repository: hbase Updated Branches: refs/heads/branch-2 2e4c1b628 -> 5cbf158aa refs/heads/master 239e68726 -> 4136ab338
HBASE-18883 Update Curator to 4.0 Signed-off-by: zhangduo <zhang...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4136ab33 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4136ab33 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4136ab33 Branch: refs/heads/master Commit: 4136ab338d5691166e7e8c44f26aad6d273283d3 Parents: 239e687 Author: Mike Drob <md...@apache.org> Authored: Tue Sep 26 15:00:49 2017 -0500 Committer: Mike Drob <md...@apache.org> Committed: Fri Sep 29 10:39:57 2017 -0500 ---------------------------------------------------------------------- pom.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4136ab33/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a684f3c..13be3ab 100755 --- a/pom.xml +++ b/pom.xml @@ -1436,7 +1436,7 @@ <bouncycastle.version>1.46</bouncycastle.version> <kerby.version>1.0.0-RC2</kerby.version> <commons-crypto.version>1.0.0</commons-crypto.version> - <curator.version>2.12.0</curator.version> + <curator.version>4.0.0</curator.version> <!-- Plugin Dependencies --> <apache.rat.version>0.12</apache.rat.version> <asciidoctor.plugin.version>1.5.5</asciidoctor.plugin.version> @@ -2066,13 +2066,14 @@ </dependency> <dependency> <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - <version>${curator.version}</version> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.curator</groupId> @@ -2083,6 +2084,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + </exclusion> </exclusions> </dependency> <dependency>