Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 7952 invoked from network); 1 Jul 2010 05:01:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Jul 2010 05:01:48 -0000 Received: (qmail 39025 invoked by uid 500); 1 Jul 2010 05:01:48 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 38939 invoked by uid 500); 1 Jul 2010 05:01:46 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 38930 invoked by uid 99); 1 Jul 2010 05:01:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jul 2010 05:01:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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, 01 Jul 2010 05:01:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2737E2388994; Thu, 1 Jul 2010 05:00:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r959512 - in /hadoop/mapreduce/branches/branch-0.21: ./ ivy/ src/contrib/capacity-scheduler/ src/contrib/fairscheduler/ src/contrib/gridmix/ src/contrib/mrunit/ src/contrib/mumak/ src/contrib/raid/ src/contrib/streaming/ Date: Thu, 01 Jul 2010 05:00:48 -0000 To: mapreduce-commits@hadoop.apache.org From: tomwhite@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100701050049.2737E2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tomwhite Date: Thu Jul 1 05:00:48 2010 New Revision: 959512 URL: http://svn.apache.org/viewvc?rev=959512&view=rev Log: Merge -r 959508:959509 from trunk to branch-0.21. Fixes: MAPREDUCE-1870. Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt hadoop/mapreduce/branches/branch-0.21/ivy.xml hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/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/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 Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=959512&r1=959511&r2=959512&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Thu Jul 1 05:00:48 2010 @@ -1482,3 +1482,5 @@ Release 0.21.0 - Unreleased MAPREDUCE-1885. Revert FileSystem create method that takes CreateFlags (MapReduce part of HADOOP-6826). (Ravi Gummadi via tomwhite) + MAPREDUCE-1870. Harmonize MapReduce JAR library versions with Common and + HDFS. (tomwhite) Modified: hadoop/mapreduce/branches/branch-0.21/ivy.xml URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy.xml?rev=959512&r1=959511&r2=959512&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/ivy.xml (original) +++ hadoop/mapreduce/branches/branch-0.21/ivy.xml Thu Jul 1 05:00:48 2010 @@ -98,7 +98,11 @@ + conf="common->default"> + + + + 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=959512&r1=959511&r2=959512&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties (original) +++ hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties Thu Jul 1 05:00:48 2010 @@ -14,23 +14,22 @@ #It drives ivy and the generation of a maven POM #These are the versions of our dependencies (in alphabetical order) -apacheant.version=1.7.1 ant-task.version=2.0.10 #Aspectj depedency for Fault injection #This property has to be updated synchronously with aop.xml aspectj.version=1.6.5 -avro.version=1.3.0 +avro.version=1.3.2 checkstyle.version=4.2 commons-cli.version=1.2 commons-collections.version=3.1 -commons-httpclient.version=3.0.1 -commons-lang.version=2.4 -commons-logging.version=1.0.4 -commons-logging-api.version=1.0.4 +commons-httpclient.version=3.1 +commons-lang.version=2.5 +commons-logging.version=1.1.1 +commons-logging-api.version=1.1 commons-el.version=1.0 commons-fileupload.version=1.2 commons-io.version=1.4 @@ -47,16 +46,15 @@ hadoop-hdfs.version=0.21.0-SNAPSHOT hsqldb.version=1.8.0.10 -#ivy.version=2.0.0-beta2 -ivy.version=2.0.0-rc2 +ivy.version=2.1.0 jasper.version=5.5.12 jsp.version=2.1 jsp-api.version=5.5.12 -jets3t.version=0.6.1 +jets3t.version=0.7.1 jetty.version=6.1.14 jetty-util.version=6.1.14 -junit.version=4.5 +junit.version=4.8.1 jdiff.version=1.0.9 kfs.version=0.3 @@ -66,7 +64,7 @@ lucene-core.version=2.3.1 mina-core.version=2.0.0-M5 -mockito-all.version=1.8.0 +mockito-all.version=1.8.2 oro.version=2.0.8 @@ -75,8 +73,8 @@ rats-lib.version=0.6 servlet.version=4.0.6 servlet-api-2.5.version=6.1.14 servlet-api.version=2.5 -slf4j-api.version=1.4.3 -slf4j-log4j12.version=1.4.3 +slf4j-api.version=1.5.11 +slf4j-log4j12.version=1.5.11 xmlenc.version=0.52 xerces.version=1.4.4 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=959512&r1=959511&r2=959512&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 Jul 1 05:00:48 2010 @@ -70,6 +70,10 @@ + rev="${avro.version}" conf="common->default"> + + + + 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=959512&r1=959511&r2=959512&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 Jul 1 05:00:48 2010 @@ -67,7 +67,11 @@ + conf="common->default"> + + + + + conf="common->default"> + + + + - + + + + + 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=959512&r1=959511&r2=959512&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 Thu Jul 1 05:00:48 2010 @@ -117,6 +117,10 @@ + conf="common->default"> + + + + 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=959512&r1=959511&r2=959512&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 Thu Jul 1 05:00:48 2010 @@ -105,7 +105,11 @@ + conf="common->default"> + + + + + rev="${avro.version}" conf="common->default"> + + + +