Repository: hadoop Updated Branches: refs/heads/branch-2.7 49ff1e527 -> 3249c3ce5
HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R. (cherry picked from commit 966f9508c3ce9dcc63dd2b169150f573699f94a7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3249c3ce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3249c3ce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3249c3ce Branch: refs/heads/branch-2.7 Commit: 3249c3ce56cc7b719599b4b0100cf6dfdeabb4df Parents: 49ff1e5 Author: Akira Ajisaka <[email protected]> Authored: Fri Oct 2 12:40:05 2015 +0200 Committer: Akira Ajisaka <[email protected]> Committed: Fri Oct 2 12:40:35 2015 +0200 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-project/pom.xml | 11 ----------- 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3249c3ce/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a574351..2a0205d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -43,6 +43,9 @@ Release 2.7.2 - UNRELEASED HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha) + HADOOP-12230. hadoop-project declares duplicate, conflicting curator + dependencies. (Rakesh R via aajisaka) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3249c3ce/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 119b221..ceca1d8 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -912,17 +912,6 @@ <version>2.9.1</version> </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> - <version>2.6.0</version> - </dependency> - <dependency> - <groupId>org.apache.curator</groupId> - <artifactId>curator-test</artifactId> - <version>2.6.0</version> - </dependency> - <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId>
