Author: cos
Date: Sun Aug 7 01:52:50 2011
New Revision: 1154636
URL: http://svn.apache.org/viewvc?rev=1154636&view=rev
Log:
HADOOP-7514. Build fails with ClassCastException when running both mvn-install
and mvn-deploy targets. Contributed by Joep Rottinghuis.
Modified:
hadoop/common/branches/branch-0.22/common/CHANGES.txt
hadoop/common/branches/branch-0.22/common/build.xml
Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1154636&r1=1154635&r2=1154636&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Sun Aug 7 01:52:50
2011
@@ -527,6 +527,9 @@ Release 0.22.0 - Unreleased
HADOOP-7513. mvn-deploy target fails (Joep Rottinghuis via cos)
+ HADOOP-7514. Build fails with ClassCastException when running both
+ mvn-install and mvn-deploy targets (Joep Rottinghuis via cos)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.22/common/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/build.xml?rev=1154636&r1=1154635&r2=1154636&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/build.xml (original)
+++ hadoop/common/branches/branch-0.22/common/build.xml Sun Aug 7 01:52:50 2011
@@ -1215,11 +1215,13 @@
<get src="${ant_task_repo_url}" dest="${ant_task.jar}"
usetimestamp="true"/>
</target>
- <target name="mvn-taskdef" depends="ant-task-download">
+ <target name="mvn-taskdef" depends="ant-task-download"
unless="mvn-taskdef.called">
<path id="mvn-ant-task.classpath" path="${ant_task.jar}"/>
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant"
classpathref="mvn-ant-task.classpath"/>
+ <!-- Record that this target is already called to avoid
ClassCastException. -->
+ <property name="mvn-taskdef.called" value="true" />
</target>
<target name="mvn-install"
depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
