From af2764a7e1ea6dc70db3b613c8efd99bd403c4e9 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Fri, 7 Jul 2006 01:31:25 +0000
Subject: [PATCH] Updated the Apache Ant instructions to specify the version of
 Junit you should use

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6252 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/sysutils/apache-ant.xml    | 20 +++++---------------
 introduction/welcome/changelog.xml |  4 ++++
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/general/sysutils/apache-ant.xml b/general/sysutils/apache-ant.xml
index d381988159..18133b2e58 100644
--- a/general/sysutils/apache-ant.xml
+++ b/general/sysutils/apache-ant.xml
@@ -4,18 +4,6 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
   <!ENTITY apache-ant-download-http "http://archive.apache.org/dist/ant/source/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-md5sum        "80a7ad191c40b7d8c82533524b282b6b">
@@ -99,9 +87,9 @@
       <application>Apache Ant</application>. Review the table at
       <ulink url="http://ant.apache.org/manual/install.html#librarydependencies"/>
       for any prerequisite libraries you may need. One such library is the
-      <application>JUnit</application> testing framework library. Many Ant-installed
-      packages will use this library to perform the unit tests during the build
-      process. To install the JUnit library along with the
+      <application>JUnit</application>-3.8.1 testing framework library. Many
+      Ant-installed packages will use this library to perform the unit tests
+      during the build process. To install the JUnit library along with the
       <application>Apache Ant</application> package, download it from
       <ulink url="http://www.junit.org/"/>, unzip the distribution file (requires
       <xref linkend="unzip"/>) and copy the <filename>junit.jar</filename> file
@@ -115,6 +103,8 @@
 
 <screen><userinput>patch -Np1 -i ../apache-ant-&apache-ant-version;-blfs_install-1.patch</userinput></screen>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>./build.sh -Ddist.dir=/opt/ant-&apache-ant-version; dist &amp;&amp;
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b7c7c75510..1f797b6ba3 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>July 7th, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated the Apache Ant instructions to specify the
+          version of Junit you should use.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Added new package - gnome-screensaver-2.14.2.</para>
         </listitem>