Author: shv
Date: Mon Aug 22 18:28:06 2011
New Revision: 1160361
URL: http://svn.apache.org/viewvc?rev=1160361&view=rev
Log:
HDFS-2214. Generated POMs hardcode dependency on hadoop-common version
0.22.0-SNAPSHOT. Contributed by Joep Rottinghuis.
Modified:
hadoop/common/branches/branch-0.22/hdfs/build.xml
hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml
Modified: hadoop/common/branches/branch-0.22/hdfs/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/build.xml?rev=1160361&r1=1160360&r2=1160361&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/build.xml Mon Aug 22 18:28:06 2011
@@ -1724,6 +1724,14 @@
<include name="hadoop-hdfs-${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-hdfs.xml"/>
+ <include name="hadoop-hdfs-${herriot.suffix}.xml"/>
+ </fileset>
+ </replaceregexp>
</target>
<!--
Modified:
hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml?rev=1160361&r1=1160360&r2=1160361&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
(original)
+++
hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-instrumented-template.xml
Mon Aug 22 18:28:06 2011
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common-instrumented</artifactId>
- <version>0.22.0-SNAPSHOT</version>
+ <version>@hadoop-common.version</version>
</dependency>
</dependencies>
</project>
Modified: hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml?rev=1160361&r1=1160360&r2=1160361&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml
(original)
+++ hadoop/common/branches/branch-0.22/hdfs/ivy/hadoop-hdfs-template.xml Mon
Aug 22 18:28:06 2011
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>0.22.0-SNAPSHOT</version>
+ <version>@hadoop-common.version</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
