Author: jglick
Date: Wed Apr 13 11:54:03 2011
New Revision: 1091755
URL: http://svn.apache.org/viewvc?rev=1091755&view=rev
Log:
Rewrote netrexx target to never call M2 tasks.
Otherwise maven-antrun-plugin in src/etc/poms/ant-netrexx/pom.xml dies under M3
with a linkage error.
Modified:
ant/core/trunk/fetch.xml
Modified: ant/core/trunk/fetch.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?rev=1091755&r1=1091754&r2=1091755&view=diff
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Wed Apr 13 11:54:03 2011
@@ -224,7 +224,6 @@ Set -Ddest=LOCATION on the command line
depends="init">
<f2 project="commons-net" />
<f2 project="com.jcraft" archive="jsch"/>
- <available property="have.commons.net"
classname="org.apache.commons.net.ftp.FTPClientConfig"/>
</target>
<target name="regexp"
@@ -310,30 +309,23 @@ Set -Ddest=LOCATION on the command line
<f2 project="com.sun.media" archive="jai-codec"
repository="http://repository.jboss.org/maven2"/>
</target>
- <target name="netrexx"
depends="init-no-m2,-setup-temp-cache,networking,-fetch-netrexx,-fetch-netrexx-no-commons-net,-cleanup-temp-cache"
- description="load NetRexx compiler" />
-
- <target name="-fetch-netrexx" depends="-setup-temp-cache"
- description="FTPs NetRexx compiler from IBM site"
if="have.commons.net">
- <get-ftp-file host="ftp.software.ibm.com"
remotedir="/software/awdtools/netrexx"
- filename="NetRexx.zip" localdir="${temp.dir}" />
+ <target name="netrexx"
depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net"
+ description="load NetRexx compiler">
<copy todir="${dest.dir}" flatten="true">
<zipfileset src="${temp.dir}/NetRexx.zip">
<include name="NetRexx\lib\NetRexxC.jar" />
<include name="NetRexx\browse\license.txt" />
</zipfileset>
</copy>
+ <antcall target="-cleanup-temp-cache"/>
</target>
-
- <target name="-fetch-netrexx-no-commons-net" depends="-setup-temp-cache"
- description="FTPs NetRexx compiler from IBM site"
unless="have.commons.net">
+ <available property="have.commons.net"
classname="org.apache.commons.net.ftp.FTPClientConfig"/>
+ <target name="-fetch-netrexx" if="have.commons.net">
+ <get-ftp-file host="ftp.software.ibm.com"
remotedir="/software/awdtools/netrexx"
+ filename="NetRexx.zip" localdir="${temp.dir}" />
+ </target>
+ <target name="-fetch-netrexx-no-commons-net" unless="have.commons.net">
<get
src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip";
dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
- <copy todir="${dest.dir}" flatten="true">
- <zipfileset src="${temp.dir}/NetRexx.zip">
- <include name="NetRexx\lib\NetRexxC.jar" />
- <include name="NetRexx\browse\license.txt" />
- </zipfileset>
- </copy>
</target>
<target name="all"
