2 files changed, 1 insertions, 55 deletions
diff --git a/java/jboss5/files/patch-build-common.xml b/java/jboss5/files/patch-build-common.xml
index fb2a1c8308c7..0bf67a9c68fc 100644
--- a/java/jboss5/files/patch-build-common.xml
+++ b/java/jboss5/files/patch-build-common.xml
@@ -1,23 +1,6 @@
 --- ./tools/etc/buildmagic/build-common.xml.orig	Sun Mar 25 20:25:52 2007
 +++ ./tools/etc/buildmagic/build-common.xml	Sun Mar 25 20:27:18 2007
-@@ -2,7 +2,7 @@
- 
-   <!-- Make sure we have the right version of Ant -->
-   <property name="buildmagic.ant16.baseversion" value="1.6"/>
--
-+  <property name="buildmagic.ant17.baseversion" value="1.7"/>
-   <!--
-      | Add new conditions for other supported Ant versions when they
-      | become avaialble.
-@@ -12,13 +12,16 @@
-     <or>
-       <contains string="${ant.version}" 
- 	        substring="Ant version ${buildmagic.ant16.baseversion}"/>
-+      <contains string="${ant.version}"
-+        substring="Ant version ${buildmagic.ant17.baseversion}"/>
-     </or>
-   </condition>
- 
+@@ -20,6 +20,7 @@
    <fail unless="buildmagic.ant.compatible">
    Unsupported Ant version:
      ${ant.version}
diff --git a/java/jboss5/files/patch-buildmagic.ent b/java/jboss5/files/patch-buildmagic.ent
deleted file mode 100644
index 2e2eeb500927..000000000000
--- a/java/jboss5/files/patch-buildmagic.ent
+++ /dev/null
@@ -1,37 +0,0 @@
---- ./tools/etc/buildmagic/buildmagic.ent.orig	Mon Nov 20 07:45:55 2006
-+++ ./tools/etc/buildmagic/buildmagic.ent	Sun Mar 25 21:28:14 2007
-@@ -7,34 +7,6 @@
- <!-- Initialize the build system. -->
- <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"/>
--
--  <!--
--     | Add new conditions for other supported Ant versions when they
--     | become avaialble.
--   -->
--
--  <condition property="buildmagic.ant.compatible">
--    <or>
--      <contains string="${ant.version}"
--        substring="Ant version ${buildmagic.ant15.baseversion}"/>
--      <contains string="${ant.version}"
--        substring="Ant version ${buildmagic.ant16.baseversion}"/>
--    </or>
--  </condition>
--
--  <fail unless="buildmagic.ant.compatible">
--
--  Unsupported Ant version:
--
--    ${ant.version}
--
--  Please install a version which is compatible with Ant ${buildmagic.ant15.baseversion} or ${buildmagic.ant16.baseversion}.
--
--  </fail>
--
-   <!-- JDK Detection -->
-   <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
-   <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>