Fix for running ant targets to use the right set of common/test jars (gkesavan via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-279@1155185 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -3,6 +3,9 @@ Hadoop MapReduce Change Log
 Trunk (unreleased changes)
 
   MAPREDUCE-279
+
+    Fix for running ant targets to use the right set of common/test jars 
+    (gkesavan via mahadev)
     
     Patch for findbugs warnings in Resource Manager (siddharth seth via mahadev)
     

mapreduce/ivy.xml

@@ -55,10 +55,9 @@
     <artifact conf="master"/>
   </publications>
  <dependencies>
-   <dependency org="org.apache.hadoop" name="hadoop-common" 
-               rev="${hadoop-common.version}" conf="common->default"/> 
    <dependency org="org.apache.hadoop" name="hadoop-common" 
                rev="${hadoop-common.version}" conf="common->default"> 
+      <artifact name="hadoop-common" ext="jar"/>
       <artifact name="hadoop-common" type="tests" ext="jar" m:classifier="tests"/>
    </dependency>
    <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
@@ -98,6 +97,8 @@
                conf="common->default"/>
    <dependency org="org.aspectj" name="aspectjtools" rev="${aspectj.version}"
                conf="common->default"/>
+   <dependency org="org.mockito" name="mockito-all" rev="${mockito.version}" 
+    conf="common->master" />
 
    <!-- Exclusions for transitive dependencies pulled in by log4j -->
    <exclude org="com.sun.jdmk"/>

mapreduce/ivy/libraries.properties

@@ -33,5 +33,7 @@ rats-lib.version=0.6
 
 xerces.version=1.4.4
 
+mockito.version=1.8.5
+
 yarn.version=1.0-SNAPSHOT
 hadoop-mapreduce.version=1.0-SNAPSHOT