Author: cos
Date: Wed Aug 17 00:39:14 2011
New Revision: 1158481
URL: http://svn.apache.org/viewvc?rev=1158481&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/CHANGES.txt
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/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1158481&r1=1158480&r2=1158481&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Wed Aug 17 00:39:14 2011
@@ -603,6 +603,9 @@ Release 0.22.0 - Unreleased
HDFS-2211. Build does not pass along properties to contrib builds (Joep
Rottinghuis via cos)
+ HDFS-2214. Generated POMs hardcode dependency on hadoop-common version
+ 0.22.0-SNAPSHOT (Joep Rottinghuis via cos)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
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=1158481&r1=1158480&r2=1158481&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/build.xml (original)
+++ hadoop/common/branches/branch-0.22/hdfs/build.xml Wed Aug 17 00:39:14 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=1158481&r1=1158480&r2=1158481&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
Wed Aug 17 00:39:14 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=1158481&r1=1158480&r2=1158481&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 Wed
Aug 17 00:39:14 2011
@@ -33,12 +33,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>0.22.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r09</version>
+ <version>@hadoop-common.version</version>
</dependency>
</dependencies>
</project>
