hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1155185 - in /hadoop/common/branches/MR-279/mapreduce: CHANGES.txt ivy.xml ivy/libraries.properties
Date Tue, 09 Aug 2011 01:29:46 GMT
Author: mahadev
Date: Tue Aug  9 01:29:46 2011
New Revision: 1155185

URL: http://svn.apache.org/viewvc?rev=1155185&view=rev
Log:
Fix for running ant targets to use the right set of common/test jars (gkesavan via mahadev)

Modified:
    hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
    hadoop/common/branches/MR-279/mapreduce/ivy.xml
    hadoop/common/branches/MR-279/mapreduce/ivy/libraries.properties

Modified: hadoop/common/branches/MR-279/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/CHANGES.txt?rev=1155185&r1=1155184&r2=1155185&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/MR-279/mapreduce/CHANGES.txt Tue Aug  9 01:29:46 2011
@@ -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)
     

Modified: hadoop/common/branches/MR-279/mapreduce/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/ivy.xml?rev=1155185&r1=1155184&r2=1155185&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/ivy.xml (original)
+++ hadoop/common/branches/MR-279/mapreduce/ivy.xml Tue Aug  9 01:29:46 2011
@@ -56,9 +56,8 @@
   </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"/>

Modified: hadoop/common/branches/MR-279/mapreduce/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-279/mapreduce/ivy/libraries.properties?rev=1155185&r1=1155184&r2=1155185&view=diff
==============================================================================
--- hadoop/common/branches/MR-279/mapreduce/ivy/libraries.properties (original)
+++ hadoop/common/branches/MR-279/mapreduce/ivy/libraries.properties Tue Aug  9 01:29:46 2011
@@ -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



Mime
View raw message