[jboss-cvs] JBossAS SVN: r79586 - branches/Branch_4_2/tools/etc/buildmagic.

[jboss-cvs-commits at lists.jboss.org]

Author: dwalluck at redhat.com
Date: 2008-10-16 11:06:01 -0400 (Thu, 16 Oct 2008)
New Revision: 79586

Modified:
   branches/Branch_4_2/tools/etc/buildmagic/buildmagic.ent
Log:
JBPAPP-414 - Allow building with ant 1.6.5 and ant 1.7.1 only

Modified: branches/Branch_4_2/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/Branch_4_2/tools/etc/buildmagic/buildmagic.ent	2008-10-16 15:04:52 UTC (rev 79585)
+++ branches/Branch_4_2/tools/etc/buildmagic/buildmagic.ent	2008-10-16 15:06:01 UTC (rev 79586)
@@ -8,9 +8,9 @@
 <target name="_buildmagic:init" unless="init.disable">
 
   <!-- Make sure we have the right version of Ant -->
-  <property name="buildmagic.ant15.baseversion" value="1.5"/>
-  <property name="buildmagic.ant16.baseversion" value="1.6"/>
-  
+  <property name="buildmagic.ant16.baseversion" value="1.6.5"/>
+  <property name="buildmagic.ant17.baseversion" value="1.7.1"/> 
+ 
   <!--
      | Add new conditions for other supported Ant versions when they
      | become avaialble.
@@ -19,9 +19,9 @@
   <condition property="buildmagic.ant.compatible">
     <or>
       <contains string="${ant.version}"
-        substring="Ant version ${buildmagic.ant15.baseversion}"/>
+        substring="Ant version ${buildmagic.ant16.baseversion}"/>
       <contains string="${ant.version}"
-        substring="Ant version ${buildmagic.ant16.baseversion}"/>
+        substring="Ant version ${buildmagic.ant17.baseversion}"/>
     </or>
   </condition>
 
@@ -31,7 +31,7 @@
 
     ${ant.version}
 
-  Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion}.
+  Please install a version which is compatible with Ant ${buildmagic.ant16.baseversion} or ${buildmagic.ant17.baseversion}.
 
   </fail>