Updated to Ant-1.7.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7676 af4574ff-66df-0310-9fd7-8a98e5e911e0

general.ent

@@ -199,7 +199,7 @@ $Date$
 <!ENTITY cpio-version                 "2.9">
 <!ENTITY mc-version                   "4.6.1">
 <!ENTITY sysstat-version              "7.0.4">
-<!ENTITY apache-ant-version           "1.7.0">
+<!ENTITY apache-ant-version           "1.7.1">
 <!ENTITY dbus-version                 "1.2.4">
 <!ENTITY hal-version                  "0.5.9.1">
 <!ENTITY unrar-version                "3.7.8">

general/sysutils/apache-ant.xml

@@ -7,7 +7,7 @@
   <!ENTITY apache-ant-download-http "&sources-anduin-http;/a/apache-ant-&apache-ant-version;-src.tar.bz2">
   <!-- <!ENTITY apache-ant-download-ftp  "ftp://ftp.oregonstate.edu/pub/apache/ant/source/apache-ant-&apache-ant-version;-src.tar.bz2"> -->
   <!ENTITY apache-ant-download-ftp  " ">
-  <!ENTITY apache-ant-md5sum        "22b378e27ab300e4d73bf09d91c7e2a6">
+  <!ENTITY apache-ant-md5sum        "0d68db4a1ada5c91bcbf53cefd0c2fd7">
   <!ENTITY apache-ant-size          "6.8 MB">
   <!ENTITY apache-ant-buildsize     "109 MB">
   <!ENTITY apache-ant-time          "0.4 SBU">
@@ -72,8 +72,10 @@
     <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="jdk"/> and
-    <xref linkend="junit"/></para>
+    <para role="required"><xref linkend="jdk"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="junit"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/apache-ant"/></para>
@@ -102,13 +104,21 @@
       <application>Apache Ant</application> build.</para> -->
     </note>
 
+    <para>If the recommendation of having <application>JUnit</application> installed
+      cannot be matched, <application>Apache Ant</application> can be installed
+      anyway but the tests cannot be performed. Remove the reference to
+      the test instructions by running the following command:</para>
+
+<screen><userinput>sed -i 's;jars,test-jar;jars;' build.xml</userinput></screen>
+
     <para>Install <application>Apache Ant</application> by running the following
     commands:</para>
 
 <screen><userinput>sed -i 's|${dist.dir}/etc|/etc/ant|'        build.xml
 sed -i 's|/etc/ant.conf|/etc/ant/ant.conf|' src/script/ant</userinput></screen>
 
-    <para>The unit regression tests are performed in the build step below.</para>
+    <para>The unit regression tests are performed in the build step below except
+      the first <command>sed</command> has been executed.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -121,6 +131,9 @@ ln -v -sf ant-&apache-ant-version; /opt/ant</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i 's;jars...</command>: If <application>JUnit</application> package
+      is not installed, the regression tests cannot be performed.</para>
+
     <para><command>sed ...</command>: These commands change the configuration
     directory to <filename class='directory'>/etc/ant</filename> to conform
     with FHS guidelines.</para>

introduction/welcome/changelog.xml

@@ -50,6 +50,9 @@
           <para>[ag] - Added a patch to imlib2-1.4.2 to fix
             CVE-2008-5187.</para>
         </listitem>
+        <listitem>
+          <para>[thomas] - Updated to Ant-1.7.1</para>
+        </listitem>
       </itemizedlist>
     </listitem>