You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ma...@apache.org on 2011/04/29 02:14:51 UTC
svn commit: r1097661 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt
pom.xml yarn/pom.xml
Author: mahadev
Date: Fri Apr 29 00:14:50 2011
New Revision: 1097661
URL: http://svn.apache.org/viewvc?rev=1097661&view=rev
Log:
MAPREDUCE-2458. Rename sanitized pom.xml in build directory to work around IDE bug (luke lu via mahadev)
Modified:
hadoop/mapreduce/branches/MR-279/CHANGES.txt
hadoop/mapreduce/branches/MR-279/pom.xml
hadoop/mapreduce/branches/MR-279/yarn/pom.xml
Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1097661&r1=1097660&r2=1097661&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Fri Apr 29 00:14:50 2011
@@ -61,6 +61,9 @@ Trunk (unreleased changes)
Clear application notification if sent once to NodeManager (mahadev)
+ MAPREDUCE-2458. Rename sanitized pom.xml in build directory to work around IDE bug
+ (luke lu via mahadev)
+
INCOMPATIBLE CHANGES
MAPREDUCE-1866. Removes deprecated class
Modified: hadoop/mapreduce/branches/MR-279/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/pom.xml?rev=1097661&r1=1097660&r2=1097661&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/pom.xml Fri Apr 29 00:14:50 2011
@@ -16,7 +16,8 @@
<hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
<hadoop-mapreduce.version>1.0-SNAPSHOT</hadoop-mapreduce.version>
<yarn.version>1.0-SNAPSHOT</yarn.version>
- <install.file>${project.build.directory}/pom.xml</install.file>
+ <install.pom>${project.build.directory}/saner-pom.xml</install.pom>
+ <install.file>${install.pom}</install.file>
</properties>
<repositories>
@@ -202,7 +203,7 @@
<phase>package</phase>
<configuration>
<target>
- <copy file="pom.xml" todir="${project.build.directory}">
+ <copy file="pom.xml" tofile="${install.pom}">
<filterchain>
<!-- we'll have to wait for ant 1.8.3 for the following
<expandproperties>
@@ -237,7 +238,7 @@
<id>install-sanitized-pom</id>
<configuration>
<file>${install.file}</file>
- <pomFile>${project.build.directory}/pom.xml</pomFile>
+ <pomFile>${install.pom}</pomFile>
</configuration>
<phase>install</phase>
<goals>
Modified: hadoop/mapreduce/branches/MR-279/yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/pom.xml?rev=1097661&r1=1097660&r2=1097661&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/pom.xml Fri Apr 29 00:14:50 2011
@@ -15,7 +15,8 @@
<hadoop-common.version>0.22.0-SNAPSHOT</hadoop-common.version>
<hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
<yarn.version>1.0-SNAPSHOT</yarn.version>
- <install.file>${project.build.directory}/pom.xml</install.file>
+ <install.pom>${project.build.directory}/saner-pom.xml</install.pom>
+ <install.file>${install.pom}</install.file>
</properties>
<repositories>
@@ -265,7 +266,7 @@
<configuration>
<target>
<echo message="project.build.directory: ${project.build.directory}"/>
- <copy file="pom.xml" todir="${project.build.directory}">
+ <copy file="pom.xml" tofile="${install.pom}">
<filterchain>
<!-- we'll have to wait for ant 1.8.3 for the following
<expandproperties>
@@ -298,7 +299,7 @@
<id>install-sanitized-pom</id>
<configuration>
<file>${install.file}</file>
- <pomFile>${project.build.directory}/pom.xml</pomFile>
+ <pomFile>${install.pom}</pomFile>
</configuration>
<phase>install</phase>
<goals>