* update ant to 1.6.5, xerces to 2.7.0, ant-contrib to 1.0b2
* keep patched xalan 2.5.2 for now. 2.6.0 still has a unicode bug.
git-svn-id: https://svn.apache.org/repos/asf/httpd/docs-build/trunk@219694 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/LICENSE b/lib/LICENSE
index 46d4329..2dbe97f 100644
--- a/lib/LICENSE
+++ b/lib/LICENSE
@@ -2,8 +2,8 @@
allmodules.pl, DocUtil.pm, metafile.pl, ant.jar, ant-bootstrap.jar,
-ant-jakarta-oro.jar, ant-launcher.jar, ant-nodeps.jar, ant-trax.jar,
-../build.xml, ../deps.xml, ../prereq.xml,
+ant-apache-oro.jar, ant-launcher.jar, ant-nodeps.jar, ant-trax.jar,
+xercesImpl.jar, xml-apis.jar, ../build.xml, ../deps.xml, ../prereq.xml,
(derived from ant 1.5.3: lcp.bat, ../build.sh, ../build.bat):
Apache License
@@ -351,64 +351,8 @@
*/
-xercesImpl.jar, xml-apis.jar:
-
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+xercesImpl.jar and xml-apis.jar further utilize third party code which is
+licensed as follows:
-------------------------------------------------------------------------------
W3C IPR SOFTWARE NOTICE
diff --git a/lib/NOTICE b/lib/NOTICE
index 3d08fee..7c15146 100644
--- a/lib/NOTICE
+++ b/lib/NOTICE
@@ -10,7 +10,7 @@
- the W3C consortium (http://www.w3c.org) ,
- the SAX project (http://www.saxproject.org)
- Please find the different license in the LICENSE file
+ Please find the different licenses in the LICENSE file
The names "Ant" and "Apache Software Foundation" must not be used to
endorse or promote products derived from this software without prior
diff --git a/lib/README b/lib/README
index 7e2cddf..a4a9e8a 100644
--- a/lib/README
+++ b/lib/README
@@ -7,17 +7,17 @@
Description: maintenance script for mod/allmodules.xml*
ant.jar
+ant-apache-oro.jar
ant-bootstrap.jar
-ant-jakarta-oro.jar
ant-launcher.jar
ant-nodeps.jar
ant-trax.jar
(lcp.bat)
- Description: ant, version 1.6.1
+ Description: ant, version 1.6.5
URL: http://ant.apache.org/
ant-contrib.jar
- Description: ant-contrib (ant add-on), version 1.0b1
+ Description: ant-contrib (ant add-on), version 1.0b2
URL: http://sourceforge.net/projects/ant-contrib/
DocUtil.pm
@@ -39,5 +39,5 @@
xercesImpl.jar
xml-apis.jar
- Description: xerces XML parser, version 2.6.2
+ Description: xerces XML parser, version 2.7.0
URL: http://xml.apache.org/xerces2-j/
diff --git a/lib/ant-apache-oro.jar b/lib/ant-apache-oro.jar
new file mode 100644
index 0000000..cc25252
--- /dev/null
+++ b/lib/ant-apache-oro.jar
Binary files differ
diff --git a/lib/ant-bootstrap.jar b/lib/ant-bootstrap.jar
index 2fd2562..901ca7d 100644
--- a/lib/ant-bootstrap.jar
+++ b/lib/ant-bootstrap.jar
Binary files differ
diff --git a/lib/ant-contrib.jar b/lib/ant-contrib.jar
index 9b043b7..ea817cd 100644
--- a/lib/ant-contrib.jar
+++ b/lib/ant-contrib.jar
Binary files differ
diff --git a/lib/ant-jakarta-oro.jar b/lib/ant-jakarta-oro.jar
deleted file mode 100644
index 7396e8d..0000000
--- a/lib/ant-jakarta-oro.jar
+++ /dev/null
Binary files differ
diff --git a/lib/ant-launcher.jar b/lib/ant-launcher.jar
index 052fc4e..1a71612 100644
--- a/lib/ant-launcher.jar
+++ b/lib/ant-launcher.jar
Binary files differ
diff --git a/lib/ant-nodeps.jar b/lib/ant-nodeps.jar
index 6bf7e7d..3e0e5d4 100644
--- a/lib/ant-nodeps.jar
+++ b/lib/ant-nodeps.jar
Binary files differ
diff --git a/lib/ant-trax.jar b/lib/ant-trax.jar
index a4b5546..f4e1540 100644
--- a/lib/ant-trax.jar
+++ b/lib/ant-trax.jar
Binary files differ
diff --git a/lib/ant.jar b/lib/ant.jar
index cf01339..3beb3b8 100644
--- a/lib/ant.jar
+++ b/lib/ant.jar
Binary files differ
diff --git a/lib/xercesImpl.jar b/lib/xercesImpl.jar
index f0fb0e8..921f792 100644
--- a/lib/xercesImpl.jar
+++ b/lib/xercesImpl.jar
Binary files differ
diff --git a/lib/xml-apis.jar b/lib/xml-apis.jar
index 2dd8377..380f625 100644
--- a/lib/xml-apis.jar
+++ b/lib/xml-apis.jar
Binary files differ
diff --git a/prereq.xml b/prereq.xml
index 6c5b72a..a45f9c5 100644
--- a/prereq.xml
+++ b/prereq.xml
@@ -23,7 +23,7 @@
<!-- include the additional tasks from ant-contrib. -->
<!-- we need for example the <for> task. -->
<!-- -->
-<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+<taskdef resource="net/sf/antcontrib/antlib.xml" />
<!-- Catalog of public W3C resources and their local copies. -->
<!-- These entitity definitions will magically injected into -->
