svn merge -c 1102940 from trunk for HADOOP-7289.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1127300 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -71,6 +71,9 @@ Trunk (unreleased changes)
     HADOOP-7267. Refactor the rm/rmr/expunge commands to conform to new
     FsCommand class.  (Daryn Sharp via szetszwo)
 
+    HADOOP-7289. In ivy.xml, test conf should not extend common conf.
+    (Eric Yang via szetszwo)
+
   OPTIMIZATIONS
 
   BUG FIXES

build.xml

@@ -211,10 +211,10 @@
     <pathelement location="${build.examples}"/>
     <pathelement location="${build.tools}"/>
     <pathelement path="${clover.jar}"/>
+    <path refid="ivy-common.classpath"/>
     <path refid="ivy-test.classpath"/>
     <pathelement location="${build.classes}"/>
     <pathelement location="${test.conf.dir}"/>
-    <path refid="ivy-common.classpath"/>
   </path>
 <!--
   <path id="test.hdfs.classpath">

ivy.xml

@@ -53,7 +53,7 @@
     <conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff"
                         description="common artifacts"/>
     <!--Testing pulls in everything-->
-    <conf name="test" extends="master,common" description="the classpath needed to run tests"/>
+   <conf name="test" extends="master" description="the classpath needed to run tests"/>
 
     <!--Private configurations. -->
 
@@ -205,7 +205,7 @@
     <dependency org="org.slf4j"
       name="slf4j-api"
       rev="${slf4j-api.version}"
-      conf="common->master"/>
+      conf="common->default"/>
     <dependency org="org.eclipse.jdt"
       name="core"
       rev="${core.version}"