Return-Path: 
 <mapreduce-commits-return-495-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 31481 invoked from network); 26 Nov 2009 16:25:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 26 Nov 2009 16:25:08 -0000
Received: (qmail 43665 invoked by uid 500); 26 Nov 2009 16:25:08 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 43599 invoked by uid 500); 26 Nov 2009 16:25:07 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 43584 invoked by uid 99); 26 Nov 2009 16:25:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2009 16:25:07 +0000
X-ASF-Spam-Status: No, hits=-2.6 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2009 16:25:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E78DF23889B8; Thu, 26 Nov 2009 16:24:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r884626 - in /hadoop/mapreduce/branches/branch-0.21: ./
 conf/
 src/c++/ src/contrib/ src/contrib/block_forensics/
 src/contrib/capacity-scheduler/ src/contrib/data_join/
 src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/contrib/f...
Date: Thu, 26 Nov 2009 16:24:43 -0000
To: mapreduce-commits@hadoop.apache.org
From: omalley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091126162443.E78DF23889B8@eris.apache.org>

Author: omalley
Date: Thu Nov 26 16:24:42 2009
New Revision: 884626

URL: http://svn.apache.org/viewvc?rev=884626&view=rev
Log:
MAPREDUCE-1239. Fix contrib components build dependencies. 
(Giridharan Kesavan and omalley) 

Modified:
    hadoop/mapreduce/branches/branch-0.21/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/.gitignore   (props changed)
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt   (contents, props changed)
    hadoop/mapreduce/branches/branch-0.21/conf/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/c++/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/   (props changed)
    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/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ivy.xml
    hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/examples/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/java/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java   (props changed)
    hadoop/mapreduce/branches/branch-0.21/src/webapps/job/   (props changed)

Propchange: hadoop/mapreduce/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,2 +1,2 @@
 /hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
 /hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/.gitignore:818355,818918,818946,824750,828081,835968,836063,883594,884468

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=884626&r1=884625&r2=884626&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu Nov 26 16:24:42 2009
@@ -833,3 +833,6 @@
     MAPREDUCE-1182. Fix overflow in reduce causing allocations to exceed the
     configured threshold. (cdouglas)
 
+    MAPREDUCE-1239. Fix contrib components build dependencies. 
+    (Giridharan Kesavan and omalley) 
+

Propchange: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
 /hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/CHANGES.txt:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf:713112
 /hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/conf:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
 /hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/c++:713112
 /hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/c++:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
 /hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,4 +1,4 @@
 /hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/block_forensics:713112
 /hadoop/core/trunk/src/contrib/block_forensics:784664-785643
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
 /hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
 /hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/build.xml:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
 /hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:818355,818918,818946,824750,828081,835968,836063,883594,884468

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=884626&r1=884625&r2=884626&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 Thu Nov 26 16:24:42 2009
@@ -26,5 +26,33 @@
   <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-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-cli" name="commons-cli" 
+                rev="${commons-cli.version}" conf="common->default"/>
+    <dependency org="commons-logging" name="commons-logging" 
+                rev="${commons-logging.version}" conf="common->default"/>
+    <dependency org="junit" name="junit" 
+                rev="${junit.version}" conf="common->default"/>
+    <dependency org="log4j" name="log4j" 
+                rev="${log4j.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jetty-util" 
+                rev="${jetty-util.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jetty"
+                rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jsp-api-2.1" 
+                rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jsp-2.1" 
+	        rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" 
+                rev="${servlet-api-2.5.version}" conf="common->master"/>
+    <dependency org="commons-httpclient" name="commons-httpclient" 
+                rev="${commons-httpclient.version}" conf="common->master"/>
+    <dependency org="org.apache.hadoop" name="avro" 
+                rev="${avro.version}" conf="common->default"/>
   </dependencies>
 </ivy-module>

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
 /hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/data_join:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
 /hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
 /hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
 /hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:818355,818918,818946,824750,828081,835968,836063,883594,884468

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=884626&r1=884625&r2=884626&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 Thu Nov 26 16:24:42 2009
@@ -24,6 +24,12 @@
   <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-hdfs" 
+                rev="${hadoop-core.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" 
+                rev="${hadoop-core.version}" conf="common->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=884626&r1=884625&r2=884626&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 Thu Nov 26 16:24:42 2009
@@ -39,6 +39,18 @@
       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-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}"

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
 /hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/index:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
 /hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/mrunit:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/src/contrib/sqoop:713112
 /hadoop/core/trunk/src/contrib/sqoop:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/sqoop:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/sqoop:818355,818918,818946,824750,828081,835968,836063,883594,884468

Modified: hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ivy.xml?rev=884626&r1=884625&r2=884626&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/contrib/sqoop/ivy.xml Thu Nov 26 16:24:42 2009
@@ -43,6 +43,7 @@
      <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" 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" 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-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"/>

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
 /hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/streaming:818355,818918,818946,824750,828081,835968,836063,883594,884468

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=884626&r1=884625&r2=884626&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 Thu Nov 26 16:24:42 2009
@@ -24,7 +24,39 @@
     <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" 
+                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-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-cli" name="commons-cli" 
+                rev="${commons-cli.version}" conf="common->default"/>
+    <dependency org="commons-logging" name="commons-logging" 
+                rev="${commons-logging.version}" conf="common->default"/>
+    <dependency org="junit" name="junit" 
+                rev="${junit.version}" conf="common->default"/>
+    <dependency org="org.mortbay.jetty" name="jetty-util"
+                rev="${jetty-util.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jetty" 
+                rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jsp-api-2.1" 
+                rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="jsp-2.1" 
+                rev="${jetty.version}" conf="common->master"/>
+    <dependency org="org.mortbay.jetty" name="servlet-api-2.5" 
+                rev="${servlet-api-2.5.version}" conf="common->master"/>
+    <dependency org="commons-httpclient" name="commons-httpclient" 
+                rev="${commons-httpclient.version}" conf="common->default"/>
+    <dependency org="log4j" name="log4j" 
+                rev="${log4j.version}" conf="common->master"/>
+    <dependency org="org.apache.hadoop" name="avro" 
+                rev="${avro.version}" conf="common->default"/>
+    <dependency org="org.slf4j" name="slf4j-api" 
+                rev="${slf4j-api.version}" conf="common->master"/>
+    <dependency org="org.slf4j" name="slf4j-log4j12" 
+                rev="${slf4j-log4j12.version}" conf="common->master"/>
   </dependencies>
 </ivy-module>

Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
 /hadoop/core/trunk/src/contrib/vaidya:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/vaidya:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/contrib/vaidya:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/examples:713112
 /hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/examples:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/java:713112
 /hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/java:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
 /hadoop/core/trunk/src/test/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,835968,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,835968,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/ipc:776175-785643
 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:818355,818918,818946,824750,828081,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,835968,836063,883594
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,835968,836063,883594,884468

Propchange: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 16:24:42 2009
@@ -1,3 +1,3 @@
 /hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
 /hadoop/core/trunk/src/webapps/job:776175-785643
-/hadoop/mapreduce/trunk/src/webapps/job:818355,818918,818946,824750,828081,835968,836063,883594
+/hadoop/mapreduce/trunk/src/webapps/job:818355,818918,818946,824750,828081,835968,836063,883594,884468