MAPREDUCE-2753. Generated POMs hardcode dependency on hadoop-common version 0.22.0-SNAPSHOT. Contributed by Joep Rottinghuis.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1154806 13f79535-47bb-0310-9956-ffa450edef68

mapreduce/CHANGES.txt

@@ -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

mapreduce/build.xml

@@ -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>
 
   <!-- ================================================================== -->

mapreduce/ivy/hadoop-mapred-instrumented-template.xml

@@ -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>

mapreduce/ivy/hadoop-mapred-template.xml

@@ -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>