svn merge -c 1213598 from trunk for HADOOP-7914.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213607 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -86,6 +86,9 @@ Release 0.23.1 - Unreleased
     HADOOP-7878  Regression: HADOOP-7777 switch changes break HDFS tests when the
     isSingleSwitch() predicate is used. (stevel)
 
+   HADOOP-7914. Remove the duplicated declaration of hadoop-hdfs test-jar in
+   hadoop-project/pom.xml.  (szetszwo)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

hadoop-project/pom.xml

@@ -137,13 +137,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-hdfs</artifactId>
-        <version>${project.version}</version>
-        <type>test-jar</type>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-mapreduce-examples</artifactId>