You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/10/18 13:38:15 UTC

svn commit: r1632765 - in /tomcat/tc6.0.x/trunk: BUILDING.txt STATUS.txt webapps/docs/building.xml webapps/docs/changelog.xml

Author: kkolinko
Date: Sat Oct 18 11:38:14 2014
New Revision: 1632765

URL: http://svn.apache.org/r1632765
Log:
Update documented minimum Ant version to use at build time to be 1.8.0

Modified:
    tomcat/tc6.0.x/trunk/BUILDING.txt
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/webapps/docs/building.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=1632765&r1=1632764&r2=1632765&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Sat Oct 18 11:38:14 2014
@@ -67,11 +67,11 @@ source distribution, do the following:
   into which you installed the JDK release.
 
 
-(1) Install Apache Ant 1.6.x on your computer
+(1) Install Apache Ant 1.8.x on your computer
 
-* If Apache Ant 1.6.x is already installed on your computer, skip to (2).
+* If Apache Ant 1.8.x is already installed on your computer, skip to (2).
 
-* Download a binary distribution of Ant 1.6.x from:
+* Download a binary distribution of Ant 1.8.x from:
 
     http://ant.apache.org/bindownload.cgi
 

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1632765&r1=1632764&r2=1632765&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Oct 18 11:38:14 2014
@@ -57,28 +57,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Update documented minimum Ant version to use at build time to be 1.8.0
-
-  Motivation: Align documentation with code.
-
-  - Compatibility with Ant 1.6.5 was broken 6 years ago by r673614,
-    as "osfamily" attribute of <exec> task is since Ant 1.7.0.
-    Running `ant -f dist.xml` with Ant 1.6.5 fails with
-    .../dist.xml:403: The <exec> type doesn't support the "osfamily" attribute.
-  
-  - Compatibility with Ant 1.7.x was broken 8 months ago by r1557724
-    as <replace> task supports arbitrary collections such as <restrict>
-    since Ant 1.8.
-    Running `ant -f dist.xml` with Ant 1.7.0, 1.7.1 fails with
-    .../dist.xml:239: The following error occurred while executing this line:
-    .../dist.xml:258: replace doesn't support the nested "restrict" element.
-
-  - Builds successfully with Ant 1.8.0.
-
-  https://people.apache.org/~kkolinko/patches/2014-09-22_tc6_Ant180.patch
-  +1: kkolinko, markt, remm
-  -1:
-
 * For https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
   Switch to the signed versions of Apache Commons Daemon 1.0.15 binaries.
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=1632765&r1=1632764&r2=1632765&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Sat Oct 18 11:38:14 2014
@@ -56,17 +56,17 @@ directory into which you installed the J
 
 </section>
 
-<section name="Install Apache Ant 1.6.5 or later">
+<section name="Install Apache Ant 1.8.0 or later">
 
 <p>
-Download a binary distribution of Ant 1.6.5 or later from 
+Download a binary distribution of Ant 1.8.0 or later from 
 <a href="http://ant.apache.org/bindownload.cgi">here</a>.
 </p>
 
 <p>
 Unpack the binary distribution into a convenient location so that the
 Ant release resides in its own directory (conventionally named
-"apache-ant-1.6.x").  For the purposes of the remainder of this document,
+"apache-ant-1.8.x").  For the purposes of the remainder of this document,
 the symbolic name "${ant.home}" is used to refer to the full pathname of
  the release directory.
 </p>
@@ -180,7 +180,7 @@ Variables to add two new Classpath varia
 <p>
 <table border="1">
  <tr><td>TOMCAT_LIBS_BASE</td><td>the base path where the binary dependencies have been downloaded</td></tr>
- <tr><td>ANT_HOME</td><td>the base path of Ant 1.6.2 or later</td></tr>
+ <tr><td>ANT_HOME</td><td>the base path of Ant 1.8.0 or later</td></tr>
 </table>
 </p>
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1632765&r1=1632764&r2=1632765&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 18 11:38:14 2014
@@ -58,6 +58,10 @@
         <bug>56988</bug>: Allow to use relative path in <code>base.path</code>
         setting when building Tomcat. (kkolinko)
       </update>
+      <fix>
+        Update documentation: the minimum version of Apache Ant required to
+        build Tomcat is 1.8.0. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org