Return-Path: 
 <notifications-return-15800-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 469 invoked from network); 13 Apr 2011 11:54:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Apr 2011 11:54:28 -0000
Received: (qmail 42839 invoked by uid 500); 13 Apr 2011 11:54:28 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 42807 invoked by uid 500); 13 Apr 2011 11:54:28 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 42800 invoked by uid 99); 13 Apr 2011 11:54:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 11:54:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 11:54:23 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 608E6238899C; Wed, 13 Apr 2011 11:54:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1091755 - /ant/core/trunk/fetch.xml
Date: Wed, 13 Apr 2011 11:54:03 -0000
To: notifications@ant.apache.org
From: jglick@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110413115403.608E6238899C@eris.apache.org>

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"