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

@@ -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

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>