Author: bodewig
Date: Thu Dec 21 01:12:05 2006
New Revision: 489295
URL: http://svn.apache.org/viewvc?view=rev&rev=489295
Log:
Upgrade Xerces and xml-apis
Added:
ant/core/trunk/NOTICE.xerces (with props)
Removed:
ant/core/trunk/LICENSE.xerces
Modified:
ant/core/trunk/LICENSE.dom
ant/core/trunk/WHATSNEW
ant/core/trunk/fetch.xml
ant/core/trunk/lib/README
ant/core/trunk/lib/libraries.properties
ant/core/trunk/lib/xercesImpl.jar
ant/core/trunk/lib/xml-apis.jar
Modified: ant/core/trunk/LICENSE.dom
URL:
http://svn.apache.org/viewvc/ant/core/trunk/LICENSE.dom?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
--- ant/core/trunk/LICENSE.dom (original)
+++ ant/core/trunk/LICENSE.dom Thu Dec 21 01:12:05 2006
@@ -1,71 +1,61 @@
-This license came from:
-http://www.w3.org/Consortium/Legal/copyright-software-19980720
+xml-commons/java/external/LICENSE.dom-software.txt $Id$
+
+
+This license came from:
http://www.w3.org/Consortium/Legal/copyright-software-20021231
W3C® SOFTWARE NOTICE AND LICENSE
-Copyright © 1994-2001 World
-Wide Web Consortium, <a href="http://www.w3.org/";>World
-Wide Web Consortium</a>, (<a href=
-"http://www.lcs.mit.edu/";>Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/";>Institut National de
-Recherche en Informatique et en Automatique</a>, <a href=
-"http://www.keio.ac.jp/";>Keio University</a>). All Rights Reserved.
-http://www.w3.org/Consortium/Legal/
-
-This W3C work (including software, documents, or other related
-items) is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this work,
-you (the licensee) agree that you have read, understood, and will
-comply with the following terms and conditions:
-Permission to use, copy, modify, and distribute this software
-and its documentation, with or without modification, for any
-purpose and without fee or royalty is hereby granted, provided that
-you include the following on ALL copies of the software and
-documentation or portions thereof, including modifications, that
-you make:
-
-The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.
-
-Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts
Institute of
-Technology, Institut National de
-Recherche en Informatique et en Automatique, Keio University). All Rights
Reserved.
-http://www.w3.org/Consortium/Legal/";
-
-Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted) within the body
+ of any redistributed or derivative code.
+ 3. Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from
+ which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior
permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
____________________________________
-This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the older formulation for the
-policy prior to this date. Please see our Copyright FAQ for common
-questions about using materials from
-our site, including specific terms and conditions for packages like
-libwww, Amaya, and Jigsaw.
-Other questions about this notice can be
-directed to [EMAIL PROTECTED]
-webmaster
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to [EMAIL PROTECTED]
+
+Joseph Reagle <[EMAIL PROTECTED]>
+
+Last revised by Reagle $Date$
Added: ant/core/trunk/NOTICE.xerces
URL:
http://svn.apache.org/viewvc/ant/core/trunk/NOTICE.xerces?view=auto&rev=489295
==============================================================================
--- ant/core/trunk/NOTICE.xerces (added)
+++ ant/core/trunk/NOTICE.xerces Thu Dec 21 01:12:05 2006
@@ -0,0 +1,17 @@
+ =========================================================================
+ == NOTICE file corresponding to section 4(d) of the Apache License, ==
+ == Version 2.0, in this case for the Apache Xerces Java distribution. ==
+ =========================================================================
+
+ Apache Xerces Java
+ Copyright 1999-2006 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick,
Inc.,
+ software copyright (c) 1999.
\ No newline at end of file
Propchange: ant/core/trunk/NOTICE.xerces
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/core/trunk/NOTICE.xerces
------------------------------------------------------------------------------
svn:executable = *
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Dec 21 01:12:05 2006
@@ -12,6 +12,10 @@
Other changes:
--------------
+* Upgraded XML API to XML commons version 1.3.04.
+
+* Upgraded to Xerces 2.9.0
+
Changes from Ant 1.6.5 to Ant 1.7.0
===================================
Modified: ant/core/trunk/fetch.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Thu Dec 21 01:12:05 2006
@@ -143,17 +143,14 @@
<!--
This is not used as
- 1. we want the names of the libraries to be fixed, or it will break Ant's
manifest.
- 2. We like to get the more recent artifacts than are in the repo at the
time of writing (2006-10-16)
- 3. Xerces has a dependency on v 1.3.03 of Xml-apis, which is wrong.
- If/when the artifacts stabilize, we could switch to it.
+ we like to get the more recent artifacts than are in the repo at the time
of writing (2006-12-21)
-->
<target name="xerces"
description="load an updated version of Xerces"
depends="init">
<f2 project="xerces" archive="xercesImpl"/>
- <f2 project="xerces" archive="xmlParserAPIs" />
+ <f2 project="xerces" archive="xml-apis" />
</target>
<target name="networking"
Modified: ant/core/trunk/lib/README
URL:
http://svn.apache.org/viewvc/ant/core/trunk/lib/README?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
--- ant/core/trunk/lib/README (original)
+++ ant/core/trunk/lib/README Thu Dec 21 01:12:05 2006
@@ -2,13 +2,14 @@
Dependencies for a list of the jar requirements for various optional
tasks and features.
-This directory contains xercesImpl.jar from the 2.6.2 release of
+This directory contains xercesImpl.jar from the 2.9.0 release of
Apache Xerces. For more information or newer releases see
-<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for
-the terms of distribution.
+<http://xerces.apache.org/xerces2-j/>. Xerces is provided under the
+same license as Apache Ant itself, see the file LICENSE.txt. For
+additional Xerces specific notes see the file NOTICE.xerces.
It also contains xml-apis.jar, an Apache-controlled collection of
-standard classes from the 1.0b2 release of the Apache XML-Commons
+standard classes from the 1.3.04 release of the Apache XML-Commons
release. For more information or newer releases see
<http://xml.apache.org/commons/>. See the files LICENSE.dom and
LICENSE.sax for the terms of distribution.
Modified: ant/core/trunk/lib/libraries.properties
URL:
http://svn.apache.org/viewvc/ant/core/trunk/lib/libraries.properties?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
--- ant/core/trunk/lib/libraries.properties (original)
+++ ant/core/trunk/lib/libraries.properties Thu Dec 21 01:12:05 2006
@@ -33,11 +33,12 @@
oro.version=2.0.8
regexp.version=1.3
which.version=1.0
-xerces.version=2.8.1
+xerces.version=2.9.0
xercesImpl.version=${xerces.version}
#should be in sync w/ xerces, but not in the maven repository
#xmlParserAPIs.version=${xerces.version}
-xmlParserAPIs.version=2.6.1
+#xmlParserAPIs.version=2.6.1
+xml-apis.version=1.3.04
xalan.version=2.7.0
xml-resolver.version=1.1
Modified: ant/core/trunk/lib/xercesImpl.jar
URL:
http://svn.apache.org/viewvc/ant/core/trunk/lib/xercesImpl.jar?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
Binary files - no diff available.
Modified: ant/core/trunk/lib/xml-apis.jar
URL:
http://svn.apache.org/viewvc/ant/core/trunk/lib/xml-apis.jar?view=diff&rev=489295&r1=489294&r2=489295
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
