Return-Path: 
 <mapreduce-commits-return-1987-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 58B1B72E5
	for <apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org>;
 Mon,  8 Aug 2011 00:30:48 +0000 (UTC)
Received: (qmail 9580 invoked by uid 500); 8 Aug 2011 00:30:48 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 9528 invoked by uid 500); 8 Aug 2011 00:30:47 -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 9520 invoked by uid 99); 8 Aug 2011 00:30:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Aug 2011 00:30:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 08 Aug 2011 00:30:45 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9DE552388903;
	Mon,  8 Aug 2011 00:30:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1154806 - in
 /hadoop/common/branches/branch-0.22/mapreduce:
 CHANGES.txt build.xml ivy/hadoop-mapred-instrumented-template.xml
 ivy/hadoop-mapred-template.xml
Date: Mon, 08 Aug 2011 00:30:26 -0000
To: mapreduce-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110808003026.9DE552388903@eris.apache.org>

Author: cos
Date: Mon Aug  8 00:30:26 2011
New Revision: 1154806

URL: http://svn.apache.org/viewvc?rev=1154806&view=rev
Log:
MAPREDUCE-2753. Generated POMs hardcode dependency on hadoop-common version 0.22.0-SNAPSHOT. Contributed by Joep Rottinghuis.

Modified:
    hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
    hadoop/common/branches/branch-0.22/mapreduce/build.xml
    hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-instrumented-template.xml
    hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-template.xml

Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1154806&r1=1154805&r2=1154806&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Mon Aug  8 00:30:26 2011
@@ -593,6 +593,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2752. Build does not pass along properties to contrib builds.
     (Joep Rottinghuis via cos)
 
+    MAPREDUCE-2753. Generated POMs hardcode dependency on hadoop-common
+    version 0.22.0-SNAPSHOT (Joep Rottinghuis via cos)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-0.22/mapreduce/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/build.xml?rev=1154806&r1=1154805&r2=1154806&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/build.xml (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/build.xml Mon Aug  8 00:30:26 2011
@@ -1616,6 +1616,14 @@
         <include name="hadoop-mapred-${herriot.suffix}-test.xml"/>
       </fileset>
     </replaceregexp>
+ 	<replaceregexp byline="true">
+  	  <regexp pattern="@hadoop-common.version"/>
+      <substitution expression="${hadoop-common.version}"/>
+      <fileset dir="${basedir}/ivy">
+  	    <include name="hadoop-mapred.xml"/>
+  	    <include name="hadoop-hdfs-${herriot.suffix}.xml"/>
+      </fileset>
+ 	</replaceregexp>
   </target>
 
   <!-- ================================================================== -->

Modified: hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-instrumented-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-instrumented-template.xml?rev=1154806&r1=1154805&r2=1154806&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-instrumented-template.xml (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-instrumented-template.xml Mon Aug  8 00:30:26 2011
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>@hadoop-common.version</version>
     </dependency>
   </dependencies>
 </project>

Modified: hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-template.xml?rev=1154806&r1=1154805&r2=1154806&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-template.xml (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/ivy/hadoop-mapred-template.xml Mon Aug  8 00:30:26 2011
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>@hadoop-common.version</version>
     </dependency>
   </dependencies>
 </project>