From eedbd033d35e77733952606d47d6c8b823235218 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Fri, 2 Oct 2015 12:40:05 +0200
Subject: [PATCH] HADOOP-12230. hadoop-project declares duplicate, conflicting
 curator dependencies. Contributed by Rakesh R.

(cherry picked from commit 966f9508c3ce9dcc63dd2b169150f573699f94a7)
(cherry picked from commit 3249c3ce56cc7b719599b4b0100cf6dfdeabb4df)
---
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 +++
 hadoop-project/pom.xml                          | 11 -----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 56a1dee64e6..ea39ebbf3ef 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -12,6 +12,9 @@ Release 2.6.3 - UNRELEASED
 
   BUG FIXES
 
+    HADOOP-12230. hadoop-project declares duplicate, conflicting curator
+    dependencies. (Rakesh R via aajisaka)
+
 Release 2.6.2 - 2015-10-21
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 010ecfff837..fd4956e514f 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -891,17 +891,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>