Ant 1.6.0 release

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275815 13f79535-47bb-0310-9956-ffa450edef68

docs/antnews.html

@@ -12,6 +12,8 @@
         <meta name="author" content="Stefan Bodewig">
   <meta name="email" content="stefan.bodewig@freenet.de">
         <meta name="author" content="Magesh Umasankar">
+  <meta name="email" content="">
+        <meta name="author" content="Antoine Levy-Lambert">
   <meta name="email" content="">
       </head>
 
@@ -174,23 +176,18 @@
   <div class="content">
     <h1 class="title">News</h1>
             <h3 class="section">
-      <a name="Ant 1.6beta3"></a>
-      Ant 1.6beta3
+      <a name="Ant 1.6.0"></a>
+      Ant 1.6.0
     </h3>
-                        <h3>December 5, 2003 - Ant 1.6beta3 Available</h3>
-                                <p>Apache Ant 1.6beta3 is now available for <a href="http://cvs.apache.org/dist/ant/v1.6beta3/">download</a>.  As
+                        <h3>December 18, 2003 - Ant 1.6.0 Available</h3>
+                                <p>Apache Ant 1.6.0 is now available for <a href="http://ant.apache.org/bindownload.cgi">download</a>.  As
     we've already said in the announcements of Ant 1.5.4, this release
     requires JDK 1.2 or later to run.</p>
-                                <p>We encourage user to give this beta a release a try and report
-    any bugs found so that we get a chance to fix them before we make
-    the final release of Ant 1.6.</p>
-                                <p>Ant 1.6 adds a lot of new features, most prominently support
+                                <p>Ant 1.6.0 adds a lot of new features, most prominently support
     for XML namespaces as well as a new concept of Ant libraries that
     makes use of namespaces to avoid name clashes of custom tasks.
     For a longer list of fixed bugs and new features see the release
     notes.</p>
-                                <p>The manual of Ant 1.6 is available on line 
-    <a href="manual-1.6beta/"> here</a>.</p>
                                 <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
 <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
@@ -199,8 +196,8 @@ did) or could be explained better, feel free to help us out in the
       Ant 1.5.4
     </h3>
                         <h3>August 12, 2003 - Ant 1.5.4 Available</h3>
-                                <p>Apache Ant 1.5.4 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+                                <p>Apache Ant 1.5.4 is still available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
     </p>
                                 <p>This is a minor bugfix release that fixes a problem with the
     <code>javah</code> task on JDK 1.4.2 and a couple of bugs in the
@@ -208,8 +205,8 @@ did) or could be explained better, feel free to help us out in the
     VAJ, there is no reason to upgrade.</p>
                                 <div class="warning">
     <div class="label">Note</div>
-    <div class="content">Ant 1.5.4 will be the last release that supports
-      JDK 1.1. The next major release of Ant, Ant 1.6, will require JDK 1.2 or
+    <div class="content">Ant 1.5.4 is the last release that supports
+      JDK 1.1. Ant 1.6.0 requires JDK 1.2 or
       later.
     </div>
     </div>
@@ -262,41 +259,18 @@ did) or could be explained better, feel free to help us out in the
       Ant 1.5.3
     </h3>
                         <h3>April 9, 2003 - Ant 1.5.3 Available</h3>
-                                <p>Apache Ant 1.5.3 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+                                <p>Apache Ant 1.5.3 is still available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
     </p>
                         <h3 class="section">
-      <a name="Ant 1.5.3 Beta 1"></a>
-      Ant 1.5.3 Beta 1
-    </h3>
-                        <h3>March 25, 2003 - Ant 1.5.3 Beta 1 Available</h3>
-                                <p>Apache Ant 1.5.3 Beta 1 is now available for 
-     <a href="http://ant.apache.org/beta/">download</a>. 
-     Please download it and try it out. If you have any issues
-     please raise a bug on 
-     <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant">BugZilla</a>
-     or send an email to the Ant dev mailing list
-     </p>
-                        <h3 class="section">
       <a name="Ant 1.5.2"></a>
       Ant 1.5.2
     </h3>
                         <h3>March 3, 2003 - Ant 1.5.2 Available!</h3>
-                                <p>The final version of Ant 1.5.2 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+                                <p>The final version of Ant 1.5.2 is available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
      If you have any feedback on this release, feel free to join the 
      discussion on the dev and user mailing lists.
-     </p>
-                        <h3 class="section">
-      <a name="Ant 1.5.2Beta1"></a>
-      Ant 1.5.2Beta1
-    </h3>
-                        <h3>February 21, 2003 - Ant 1.5.2 Beta1 Available!</h3>
-                                <p>The first beta version of Ant 1.5.2 is now available for 
-     download at <a href="http://www.apache.org/dist/ant/v1.5.2beta1/">
-     http://www.apache.org/dist/ant/v1.5.2beta1</a>. 
-     If you have any feedback on the beta feel free to join the 
-     discussion on the dev and user mailing lists.
      </p>
                         <h3 class="section">
       <a name="Ant Top Level Project"></a>
@@ -316,19 +290,10 @@ did) or could be explained better, feel free to help us out in the
       Ant 1.5.1
     </h3>
                         <h3>October 3, 2002 - Ant 1.5.1 Available !</h3>
-                                <p>The final version of Ant 1.5.1 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">
+                                <p>The final version of Ant 1.5.1 is still available for
+     <a href="http://archive.apache.org/dist/ant">
      download</a>. If you have any feedback on this release, feel free to join the 
      discussion on the ant-dev and ant-user mailing lists.
-     </p>
-                        <h3 class="section">
-      <a name="Ant 1.5.1Beta1"></a>
-      Ant 1.5.1Beta1
-    </h3>
-                        <h3>August 19, 2002 - Ant 1.5.1 Beta1 Available !</h3>
-                                <p>The first beta version of Ant 1.5.1 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
      </p>
                         <h3 class="section">
       <a name="Ant 1.5"></a>
@@ -342,33 +307,6 @@ did) or could be explained better, feel free to help us out in the
      <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.5/">
      download</a>. If you have any feedback on this release, feel free to join the 
      discussion on the ant-dev and ant-user mailing lists.
-     </p>
-                        <h3 class="section">
-      <a name="Ant 1.5Beta3"></a>
-      Ant 1.5Beta3
-    </h3>
-                        <h3>June 24, 2002 - Ant 1.5 Beta3 Available!</h3>
-                                <p>The third beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-                        <h3 class="section">
-      <a name="Ant 1.5Beta2"></a>
-      Ant 1.5Beta2
-    </h3>
-                        <h3>June 1, 2002 - Ant 1.5 Beta2 Available!</h3>
-                                <p>The second beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-                        <h3 class="section">
-      <a name="Ant 1.5Beta1"></a>
-      Ant 1.5Beta1
-    </h3>
-                        <h3>Ant 1.5 Beta1 Available !</h3>
-                                <p>The first beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
      </p>
                         <h3 class="section">
       <a name="Ant wins again!"></a>
@@ -424,65 +362,11 @@ did) or could be explained better, feel free to help us out in the
      download area</a>. 
      </p>
                         <h3 class="section">
-      <a name="Ant 2.0 Requirements Collected - Next is Design"></a>
-      Ant 2.0 Requirements Collected - Next is Design
-    </h3>
-                        <p>A commented version of the collected user requirements is now
-      available <a href="ant2/features.html">here</a> - it is not
-      complete as some details still have to be defined, but it should
-      give you an idea of what Ant2 is going to look like.</p>
-                                <p>Several details can only be decided in the light of real code
-      and prototypes.  Several people are working on prototypes (that
-      can be found in Ant's CVS module in the proposals directory) and
-      discussion is going on on the Ant-Dev mailing list.</p>
-                        <h3 class="section">
       <a name="Best-Practices Profile of Ant at Sun's Dot-Com Builder"></a>
       Best-Practices Profile of Ant at Sun's Dot-Com Builder
     </h3>
                         <p>Sun has released an introductory article on Ant on their
       Dot-Com Builder site on May 30 2001. See <a href="http://dcb.sun.com/practices/profiles/ant.jsp">http://dcb.sun.com/practices/profiles/ant.jsp</a></p>
-                        <h3 class="section">
-      <a name="Ant 2.0 Requirements"></a>
-      Ant 2.0 Requirements
-    </h3>
-                        <p>Ant has been in use for quite some time and has been used in ways never conceived when it
-       was originally written. While Ant 1.x has continued to sucessfully evolve and grow, there 
-       are a number of limitations and inconsistencies that are now apparent and which need to 
-       be addressed. 
-    </p>
-                                <p>
-       As we continue to evolve and enhance Ant 1.x, it is now time to define what Ant 2.0 will
-       encompass. Ant 2.0 will be a major rearchitecting of Ant. It has a number of goals including:
-    </p>
-                                <ul>
-         <li>Define the "contract" with build file writers to which Ant will be bound.</li>
-         <li>Define the "contract" between the Ant core and Task writers.</li>
-         <li>Make Ant more easily extendable by allowing additional tasks to be "dropped" in.</li>
-         <li>Allow Ant to function as a component to simplify integration with GUIs and IDEs.</li>
-         <li>Make Ant more regular and logical.</li>
-       </ul>
-                                <p>       
-       It is expected that Ant 2.0 will break Ant 1.x based build files. The intention is to
-       make this the last time that will happen.
-     </p>
-                                <p>
-        To advance the definition of Ant, user requirements are now being accepted on the 
-        Ant-Dev mailing list. Any requirement will be accepted for consideration. The 
-        requirements are being collected into a document which is available 
-        <a href="ant2/requested-features.txt">on-line</a>. New features will be excepted 
-        until March 21st, 2001. At that time, each requirement will be discussed 
-        for inclusion in an Ant 2.0 requirement document.
-      </p>
-                                <p>
-        For your reference some of the goals which have shaped the development of Ant 1.x are
-        available <a href="ant2/original-specification.html">here</a>. These continue to be
-        relevant to Ant 2.0.
-      </p>
-                                <p>
-        If you want to shape the future of Ant, join the 
-        <a href="mail.html">Ant-Dev mailing list</a> and contribute
-        your ideas.
-      </p>
                 
     </div>
   </div>

docs/faq.html

@@ -529,6 +529,16 @@
       valign="top" align="left">
           12 August 2003
       </td>
+      </tr>
+                  <tr>
+                      <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          1.6.0
+      </td>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          18 December 2003
+      </td>
       </tr>
         </table>
                                 <p class="faq">

docs/index.html

@@ -172,40 +172,21 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Ant 1.6beta3"></a>
-      Ant 1.6beta3
+      <a name="Ant 1.6.0"></a>
+      Ant 1.6.0
     </h3>
-                        <p>Apache Ant 1.6beta3 is now available for <a href="http://cvs.apache.org/dist/ant/v1.6beta3/">download</a>.  As
+                        <p>Apache Ant 1.6.0 is now available for <a href="http://ant.apache.org/bindownload.cgi">download</a>.  As
     we've already said in the announcements of Ant 1.5.4, this release
     requires JDK 1.2 or later to run.</p>
-                                <p>We encourage user to give this beta a release a try and report
-    any bugs found so that we get a chance to fix them before we make
-    the final release of Ant 1.6.</p>
-                                <p>Ant 1.6 adds a lot of new features, most prominently support
+                                <p>Ant 1.6.0 adds a lot of new features, most prominently support
     for XML namespaces as well as a new concept of Ant libraries that
     makes use of namespaces to avoid name clashes of custom tasks.
     For a longer list of fixed bugs and new features see the release
     notes.</p>
-                                <p>The manual of Ant 1.6 is available on line 
-    <a href="manual-1.6beta/"> here</a>.</p>
                                 <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
 <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
                         <h3 class="section">
-      <a name="Ant 1.5.4"></a>
-      Ant 1.5.4
-    </h3>
-                        <p>Apache Ant 1.5.4 is now available for
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>.
-    </p>
-                                <div class="warning">
-    <div class="label">Note</div>
-    <div class="content">Ant 1.5.4 will be the last release that supports
-      JDK 1.1. The next major release of Ant, Ant 1.6, will require JDK 1.2 or
-      later
-    </div>
-    </div>
-                        <h3 class="section">
       <a name="Apache Ant"></a>
       Apache Ant
     </h3>
@@ -253,7 +234,7 @@ on.
       Documentation
     </h3>
                         <p>
-You can view the documentation for the current release (Apache Ant 1.5.4)
+You can view the documentation for the current release (Apache Ant 1.6.0)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>

xdocs/antnews.xml

@@ -5,30 +5,24 @@
     <author email="">Conor MacNeill</author>
     <author email="stefan.bodewig@freenet.de">Stefan Bodewig</author>
     <author email="">Magesh Umasankar</author>
+    <author email="">Antoine Levy-Lambert</author>
     <title>News</title>
   </properties>
 
 <body>
-   <section name="Ant 1.6beta3">
-    <h3>December 5, 2003 - Ant 1.6beta3 Available</h3>
-    <p>Apache Ant 1.6beta3 is now available for <a
-    href="http://cvs.apache.org/dist/ant/v1.6beta3/">download</a>.  As
+   <section name="Ant 1.6.0">
+    <h3>December 18, 2003 - Ant 1.6.0 Available</h3>
+    <p>Apache Ant 1.6.0 is now available for <a
+    href="http://ant.apache.org/bindownload.cgi">download</a>.  As
     we've already said in the announcements of Ant 1.5.4, this release
     requires JDK 1.2 or later to run.</p>
 
-    <p>We encourage user to give this beta a release a try and report
-    any bugs found so that we get a chance to fix them before we make
-    the final release of Ant 1.6.</p>
-
-    <p>Ant 1.6 adds a lot of new features, most prominently support
+    <p>Ant 1.6.0 adds a lot of new features, most prominently support
     for XML namespaces as well as a new concept of Ant libraries that
     makes use of namespaces to avoid name clashes of custom tasks.
     For a longer list of fixed bugs and new features see the release
     notes.</p>
     
-    <p>The manual of Ant 1.6 is available on line 
-    <a href="manual-1.6beta/"> here</a>.</p>
-
     <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
 <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
@@ -37,8 +31,8 @@ did) or could be explained better, feel free to help us out in the
 
   <section name="Ant 1.5.4">
     <h3>August 12, 2003 - Ant 1.5.4 Available</h3>
-    <p>Apache Ant 1.5.4 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+    <p>Apache Ant 1.5.4 is still available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
     </p>
     
     <p>This is a minor bugfix release that fixes a problem with the
@@ -48,8 +42,8 @@ did) or could be explained better, feel free to help us out in the
 
     <div class="warning">
     <div class="label">Note</div>
-    <div class="content">Ant 1.5.4 will be the last release that supports
-      JDK 1.1. The next major release of Ant, Ant 1.6, will require JDK 1.2 or
+    <div class="content">Ant 1.5.4 is the last release that supports
+      JDK 1.1. Ant 1.6.0 requires JDK 1.2 or
       later.
     </div>
     </div>
@@ -103,43 +97,21 @@ did) or could be explained better, feel free to help us out in the
   
   <section name="Ant 1.5.3">
     <h3>April 9, 2003 - Ant 1.5.3 Available</h3>
-    <p>Apache Ant 1.5.3 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+    <p>Apache Ant 1.5.3 is still available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
     </p>
   </section>
 
 
-  <section name="Ant 1.5.3 Beta 1">
-    <h3>March 25, 2003 - Ant 1.5.3 Beta 1 Available</h3>
-    <p>Apache Ant 1.5.3 Beta 1 is now available for 
-     <a href="http://ant.apache.org/beta/">download</a>. 
-     Please download it and try it out. If you have any issues
-     please raise a bug on 
-     <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant">BugZilla</a>
-     or send an email to the Ant dev mailing list
-     </p>
-  </section>
-
-
   <section name="Ant 1.5.2">
     <h3>March 3, 2003 - Ant 1.5.2 Available!</h3>
-    <p>The final version of Ant 1.5.2 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>. 
+    <p>The final version of Ant 1.5.2 is available for
+     <a href="http://archive.apache.org/dist/ant">download</a>.
      If you have any feedback on this release, feel free to join the 
      discussion on the dev and user mailing lists.
      </p>
   </section>
 
-  <section name="Ant 1.5.2Beta1">
-    <h3>February 21, 2003 - Ant 1.5.2 Beta1 Available!</h3>
-    <p>The first beta version of Ant 1.5.2 is now available for 
-     download at <a href="http://www.apache.org/dist/ant/v1.5.2beta1/">
-     http://www.apache.org/dist/ant/v1.5.2beta1</a>. 
-     If you have any feedback on the beta feel free to join the 
-     discussion on the dev and user mailing lists.
-     </p>
-  </section>
-
   <section name="Ant Top Level Project">
     <h3>November 18, 2002</h3>
     <p>The Apache board <a href="mission.html">created</a>
@@ -154,21 +126,13 @@ did) or could be explained better, feel free to help us out in the
     
   <section name="Ant 1.5.1">
     <h3>October 3, 2002 - Ant 1.5.1 Available !</h3>
-    <p>The final version of Ant 1.5.1 is now available for 
-     <a href="http://ant.apache.org/bindownload.cgi">
+    <p>The final version of Ant 1.5.1 is still available for
+     <a href="http://archive.apache.org/dist/ant">
      download</a>. If you have any feedback on this release, feel free to join the 
      discussion on the ant-dev and ant-user mailing lists.
      </p>
   </section>
 
-  <section name="Ant 1.5.1Beta1">
-    <h3>August 19, 2002 - Ant 1.5.1 Beta1 Available !</h3>
-    <p>The first beta version of Ant 1.5.1 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-  </section>
-
   <section name="Ant 1.5">
     <h3>July 15, 2002 - Fix for Cygwin problem in wrapper script available</h3>
       <p>The wrapper script of Ant 1.5 needs to be replaced with a new
@@ -183,30 +147,6 @@ did) or could be explained better, feel free to help us out in the
      </p>
   </section>
 
-  <section name="Ant 1.5Beta3">
-    <h3>June 24, 2002 - Ant 1.5 Beta3 Available!</h3>
-    <p>The third beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-  </section>
-
-  <section name="Ant 1.5Beta2">
-    <h3>June 1, 2002 - Ant 1.5 Beta2 Available!</h3>
-    <p>The second beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-  </section>
-
-  <section name="Ant 1.5Beta1">
-    <h3>Ant 1.5 Beta1 Available !</h3>
-    <p>The first beta version of Ant 1.5 is now available for 
-     download. If you have any feedback on the beta feel free to join the 
-     discussion on the ant-dev and ant-user mailing lists.
-     </p>
-  </section>
-
   <section name="Ant wins again!">
     <a href="http://www.sdmagazine.com"><img src="images/sdm_productivity_award.gif" alt="" border="0" height="108" width="181" align="right"/></a>
     <h3>Apr 29, 2002: Ant wins <em>Software Development</em> magazine&apos;s
@@ -257,68 +197,12 @@ did) or could be explained better, feel free to help us out in the
      </p>
   </section>
 
-  <section name="Ant 2.0 Requirements Collected - Next is Design">
-      <p>A commented version of the collected user requirements is now
-      available <a href="ant2/features.html">here</a> - it is not
-      complete as some details still have to be defined, but it should
-      give you an idea of what Ant2 is going to look like.</p>
-
-      <p>Several details can only be decided in the light of real code
-      and prototypes.  Several people are working on prototypes (that
-      can be found in Ant's CVS module in the proposals directory) and
-      discussion is going on on the Ant-Dev mailing list.</p>
-  </section>
-
   <section name="Best-Practices Profile of Ant at Sun&apos;s Dot-Com Builder">
       <p>Sun has released an introductory article on Ant on their
       Dot-Com Builder site on May&#160;30&#160;2001. See <a
       href="http://dcb.sun.com/practices/profiles/ant.jsp">http://dcb.sun.com/practices/profiles/ant.jsp</a></p>
   </section>
 
-  <section name="Ant 2.0 Requirements">
-    <p>Ant has been in use for quite some time and has been used in ways never conceived when it
-       was originally written. While Ant 1.x has continued to sucessfully evolve and grow, there 
-       are a number of limitations and inconsistencies that are now apparent and which need to 
-       be addressed. 
-    </p>
-    
-    <p>
-       As we continue to evolve and enhance Ant 1.x, it is now time to define what Ant 2.0 will
-       encompass. Ant 2.0 will be a major rearchitecting of Ant. It has a number of goals including:
-    </p>
-       <ul>
-         <li>Define the "contract" with build file writers to which Ant will be bound.</li>
-         <li>Define the "contract" between the Ant core and Task writers.</li>
-         <li>Make Ant more easily extendable by allowing additional tasks to be "dropped" in.</li>
-         <li>Allow Ant to function as a component to simplify integration with GUIs and IDEs.</li>
-         <li>Make Ant more regular and logical.</li>
-       </ul>
-     <p>       
-       It is expected that Ant 2.0 will break Ant 1.x based build files. The intention is to
-       make this the last time that will happen.
-     </p>
-     
-     <p>
-        To advance the definition of Ant, user requirements are now being accepted on the 
-        Ant-Dev mailing list. Any requirement will be accepted for consideration. The 
-        requirements are being collected into a document which is available 
-        <a href="ant2/requested-features.txt">on-line</a>. New features will be excepted 
-        until March 21st, 2001. At that time, each requirement will be discussed 
-        for inclusion in an Ant 2.0 requirement document.
-      </p>
-      
-      <p>
-        For your reference some of the goals which have shaped the development of Ant 1.x are
-        available <a href="ant2/original-specification.html">here</a>. These continue to be
-        relevant to Ant 2.0.
-      </p>
-      
-      <p>
-        If you want to shape the future of Ant, join the 
-        <a href="mail.html">Ant-Dev mailing list</a> and contribute
-        your ideas.
-      </p>
-  </section>
 
 </body>
 </document>

xdocs/faq.xml

@@ -166,6 +166,11 @@
             <td>1.5.4</td>
             <td>12 August 2003</td>
           </tr>
+
+          <tr>
+            <td>1.6.0</td>
+            <td>18 December 2003</td>
+          </tr>
         </table>
       </answer>
     </faq>

xdocs/index.xml

@@ -9,46 +9,24 @@
 
 <body>
 
- <section name="Ant 1.6beta3">
-    <p>Apache Ant 1.6beta3 is now available for <a
-    href="http://cvs.apache.org/dist/ant/v1.6beta3/">download</a>.  As
+ <section name="Ant 1.6.0">
+    <p>Apache Ant 1.6.0 is now available for <a
+    href="http://ant.apache.org/bindownload.cgi">download</a>.  As
     we've already said in the announcements of Ant 1.5.4, this release
     requires JDK 1.2 or later to run.</p>
 
-    <p>We encourage user to give this beta a release a try and report
-    any bugs found so that we get a chance to fix them before we make
-    the final release of Ant 1.6.</p>
-
-    <p>Ant 1.6 adds a lot of new features, most prominently support
+    <p>Ant 1.6.0 adds a lot of new features, most prominently support
     for XML namespaces as well as a new concept of Ant libraries that
     makes use of namespaces to avoid name clashes of custom tasks.
     For a longer list of fixed bugs and new features see the release
     notes.</p>
     
-    <p>The manual of Ant 1.6 is available on line 
-    <a href="manual-1.6beta/"> here</a>.</p>
-
     <p>If you find anything that hasn't been covered in the manual (I bet you
 did) or could be explained better, feel free to help us out in the
 <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?NewAntFeaturesInDetail">Wiki </a>.</p>
 
  </section>
 
- <section name="Ant 1.5.4">
-    <p>Apache Ant 1.5.4 is now available for
-     <a href="http://ant.apache.org/bindownload.cgi">download</a>.
-    </p>
-
-    <div class="warning">
-    <div class="label">Note</div>
-    <div class="content">Ant 1.5.4 will be the last release that supports
-      JDK 1.1. The next major release of Ant, Ant 1.6, will require JDK 1.2 or
-      later
-    </div>
-    </div>
-
-  </section>
-
   <section name="Apache Ant">
 
 <p>
@@ -100,7 +78,7 @@ on.
   <section name="Documentation">
 
 <p>
-You can view the documentation for the current release (Apache Ant 1.5.4)
+You can view the documentation for the current release (Apache Ant 1.6.0)
 <a href="manual/index.html">online</a>
 </p>