hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r949091 - in /hadoop/mapreduce/branches/branch-0.21: ./ ivy/ src/contrib/block_forensics/ src/contrib/capacity-scheduler/ src/contrib/data_join/ src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/contrib/fairscheduler/ src/contr...
Date Fri, 28 May 2010 03:47:33 GMT
Author: tomwhite
Date: Fri May 28 03:47:32 2010
New Revision: 949091

URL: http://svn.apache.org/viewvc?rev=949091&view=rev
Log:
Merge -r 949089:949090 from trunk to branch 0.21. Fixes: MAPREDUCE-1751.

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/build.xml
    hadoop/mapreduce/branches/branch-0.21/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml
    hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
    hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/build.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/raid/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/vertica/ivy.xml

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Fri May 28 03:47:32 2010
@@ -731,6 +731,9 @@ Release 0.21.0 - Unreleased
     MAPREDUCE-1623. Apply audience and stability notations to Hadoop
     Map-Reduce. (tomwhite via acmurthy) 
 
+    MAPREDUCE-1751. Change MapReduce to depend on Hadoop 'common' artifacts
+    instead of 'core'. (tomwhite)
+
   OPTIMIZATIONS
 
     MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band

Modified: hadoop/mapreduce/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build.xml Fri May 28 03:47:32 2010
@@ -413,7 +413,7 @@
   <target name="compile-contrib" depends="compile-core,tools">
      <subant target="compile">
         <property name="version" value="${version}"/>
-        <property name="hadoop-core.version" value="${hadoop-core.version}"/>
+        <property name="hadoop-common.version" value="${hadoop-common.version}"/>
         <fileset file="${contrib.dir}/build.xml"/>
      </subant>  	
   </target>
@@ -881,7 +881,7 @@
           </fileset>
           <path refid="javadoc-classpath"/>
           <pathelement path="${java.class.path}"/>
-          <pathelement path="${lib.dir}/hadoop-core-test-${hadoop-core.version}.jar"/>
+          <pathelement path="${lib.dir}/hadoop-common-test-${hadoop-common.version}.jar"/>
           <pathelement location="${build.tools}"/>
         </classpath>
 
@@ -941,7 +941,7 @@
           </fileset>
           <path refid="javadoc-classpath"/>
           <pathelement path="${java.class.path}"/>
-          <pathelement path="${lib.dir}/hadoop-core-test-${hadoop-core.version}.jar"/>
+          <pathelement path="${lib.dir}/hadoop-common-test-${hadoop-common.version}.jar"/>
           <pathelement location="${build.tools}"/>
         </classpath>
 
@@ -954,14 +954,14 @@
        <group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
        <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
        <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet"
-         path="${common.ivy.lib.dir}/hadoop-core-${version}.jar"/>
+         path="${common.ivy.lib.dir}/hadoop-common-${version}.jar"/>
     </javadoc>
   </target>	
 
   <target name="api-xml" depends="ivy-retrieve-jdiff,javadoc,write-null">
     <javadoc maxmemory="${javadoc.maxmemory}">
        <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
-         path="${common.ivy.lib.dir}/hadoop-core-${version}.jar:${jdiff.jar}:${xerces.jar}">
+         path="${common.ivy.lib.dir}/hadoop-common-${version}.jar:${jdiff.jar}:${xerces.jar}">
          <param name="-apidir" value="${jdiff.xml.dir}"/>
          <param name="-apiname" value="hadoop-mapred ${version}"/>
          <param name="${jdiff.stability}"/>
@@ -989,7 +989,7 @@
 	     sourceFiles="${jdiff.home}/Null.java"
 	     maxmemory="${javadoc.maxmemory}">
        <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
-         path="${common.ivy.lib.dir}/hadoop-core-${version}.jar:${jdiff.jar}:${xerces.jar}">
+         path="${common.ivy.lib.dir}/hadoop-common-${version}.jar:${jdiff.jar}:${xerces.jar}">
          <param name="-oldapi" value="hadoop-mapred ${jdiff.stable}"/>
          <param name="-newapi" value="hadoop-mapred ${version}"/>
          <param name="-oldapidir" value="${jdiff.xml.dir}"/>
@@ -1217,8 +1217,8 @@
   </target>   
 
   <target name="clean-cache" description="Clean. Delete ivy cache">
-    <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-core"/>
-    <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-core-test"/>
+    <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-common"/>
+    <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-common-test"/>
     <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-hdfs"/>
     <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-hdfs-test"/>
   </target>

Modified: hadoop/mapreduce/branches/branch-0.21/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy.xml Fri May 28 03:47:32 2010
@@ -54,10 +54,10 @@
     <artifact conf="master"/>
   </publications>
  <dependencies>
-   <dependency org="org.apache.hadoop" name="hadoop-core" 
-               rev="${hadoop-core.version}" conf="common->default"/> 
-   <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-               rev="${hadoop-core.version}" conf="common->default"/> 
+   <dependency org="org.apache.hadoop" name="hadoop-common" 
+               rev="${hadoop-common.version}" conf="common->default"/> 
+   <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+               rev="${hadoop-common.version}" conf="common->default"/> 
    <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
                rev="${hadoop-hdfs.version}" conf="common->default"/> 
    <dependency org="commons-logging" name="commons-logging" 
@@ -69,8 +69,8 @@
                conf="common->master"/>
    <dependency org="org.slf4j" name="slf4j-log4j12" 
                rev="${slf4j-log4j12.version}" conf="common->master"/>
-   <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-               rev="${hadoop-core.version}" conf="test->default"/>
+   <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+               rev="${hadoop-common.version}" conf="test->default"/>
    <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 
                rev="${hadoop-hdfs.version}" conf="test->default"/>
 

Modified: hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-template.xml Fri May 28 03:47:32
2010
@@ -27,7 +27,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-core</artifactId>
+      <artifactId>hadoop-common</artifactId>
       <version>0.21.0-dev-SNAPSHOT</version>
     </dependency>
   </dependencies>

Modified: hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties Fri May 28 03:47:32 2010
@@ -41,7 +41,7 @@ ftplet-api.version=1.0.0
 ftpserver-core.version=1.0.0
 ftpserver-deprecated.version=1.0.0-M2
 
-hadoop-core.version=0.21.0-SNAPSHOT
+hadoop-common.version=0.21.0-SNAPSHOT
 hadoop-hdfs.version=0.21.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ivy.xml Fri May 28 03:47:32
2010
@@ -42,7 +42,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" 
-                rev="${hadoop-core.version}" conf="common->default"/>  
+    <dependency org="org.apache.hadoop" name="hadoop-common" 
+                rev="${hadoop-common.version}" conf="common->default"/>  
   </dependencies>
 </ivy-module>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml Fri May 28
03:47:32 2010
@@ -41,10 +41,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" 
-                rev="${hadoop-core.version}" conf="common->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-                rev="${hadoop-core.version}" conf="test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" 
+                rev="${hadoop-common.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+                rev="${hadoop-common.version}" conf="test->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ivy.xml Fri May 28 03:47:32
2010
@@ -41,8 +41,8 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
-     <dependency org="org.apache.hadoop" name="hadoop-core-test" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}"
conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ivy.xml Fri May 28
03:47:32 2010
@@ -37,7 +37,7 @@
   </publications>
 
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
     <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"/>
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}"
conf="common->master"/>
     <dependency org="tomcat" name="jasper-runtime" rev="${jasper.version}" conf="common->master"/>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/build.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/build.xml Fri May 28
03:47:32 2010
@@ -67,8 +67,8 @@
   <!-- Override jar target to specify manifest -->
   <target name="jar" depends="compile" unless="skip.contrib">
     <mkdir dir="${build.dir}/lib"/>
-    <copy tofile="${build.dir}/lib/hadoop-core.jar">
-      <fileset dir="${hadoop.root}/build/ivy/lib/Hadoop/common" includes="hadoop-core-*.jar"
excludes="hadoop-core-test-*.jar"/>
+    <copy tofile="${build.dir}/lib/hadoop-common.jar">
+      <fileset dir="${hadoop.root}/build/ivy/lib/Hadoop/common" includes="hadoop-common-*.jar"
excludes="hadoop-common-test-*.jar"/>
     </copy> 
     <copy file="${hadoop.root}/build/ivy/lib/Hadoop/common/commons-cli-${commons-cli.version}.jar"
 todir="${build.dir}/lib" verbose="true"/>
     <jar

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ivy.xml Fri May 28 03:47:32
2010
@@ -41,7 +41,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ivy.xml Fri May 28 03:47:32
2010
@@ -40,14 +40,14 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" 
-                rev="${hadoop-core.version}" conf="common->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-                rev="${hadoop-core.version}" conf="test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" 
+                rev="${hadoop-common.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+                rev="${hadoop-common.version}" conf="test->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
-                rev="${hadoop-core.version}" conf="common->default"/>
+                rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 
-                rev="${hadoop-core.version}" conf="test->default"/>
+                rev="${hadoop-common.version}" conf="test->default"/>
     <dependency org="commons-logging"
       name="commons-logging"
       rev="${commons-logging.version}"

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/gridmix/ivy.xml Fri May 28 03:47:32
2010
@@ -37,12 +37,12 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core"
-      rev="${hadoop-core.version}"
+      name="hadoop-common"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core-test"
-      rev="${hadoop-core.version}"
+      name="hadoop-common-test"
+      rev="${hadoop-common.version}"
       conf="test->default"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-hdfs"

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ivy.xml Fri May 28 03:47:32 2010
@@ -41,8 +41,8 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
-     <dependency org="org.apache.hadoop" name="hadoop-core-test" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}"
conf="common->default"/>
      <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}"
conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ivy.xml Fri May 28 03:47:32 2010
@@ -41,7 +41,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="junit" name="junit" rev="${junit.version}" conf="common->master"/>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/ivy.xml Fri May 28 03:47:32 2010
@@ -39,10 +39,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" 
-                rev="${hadoop-core.version}" conf="common->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-                rev="${hadoop-core.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" 
+                rev="${hadoop-common.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+                rev="${hadoop-common.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/raid/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/raid/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/raid/ivy.xml Fri May 28 03:47:32 2010
@@ -37,12 +37,12 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core"
-      rev="${hadoop-core.version}"
+      name="hadoop-common"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core-test"
-      rev="${hadoop-core.version}"
+      name="hadoop-common-test"
+      rev="${hadoop-common.version}"
       conf="test->default"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-hdfs"

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml Fri May 28 03:47:32
2010
@@ -40,10 +40,10 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" 
-                rev="${hadoop-core.version}" conf="common->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-core-test" 
-                rev="${hadoop-core.version}" conf="test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" 
+                rev="${hadoop-common.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" 
+                rev="${hadoop-common.version}" conf="test->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs" 
                 rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test"

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ivy.xml Fri May 28 03:47:32 2010
@@ -41,7 +41,7 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-    <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>
   </dependencies>

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/vertica/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/vertica/ivy.xml?rev=949091&r1=949090&r2=949091&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/vertica/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/vertica/ivy.xml Fri May 28 03:47:32
2010
@@ -41,8 +41,8 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop"
-      name="hadoop-core"
-      rev="${hadoop-core.version}"
+      name="hadoop-common"
+      rev="${hadoop-common.version}"
       conf="common->default"/>
     <dependency org="commons-logging"
       name="commons-logging"



Mime
View raw message