From ad860385a7ea50bd0e679744911ffa6195c3b649 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Wed, 13 Apr 2011 11:54:03 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1091755 13f79535-47bb-0310-9956-ffa450edef68
---
 fetch.xml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/fetch.xml b/fetch.xml
index d0628d283..2319fbf8b 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -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"