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