Author: stevel
Date: Mon Oct 16 05:40:48 2006
New Revision: 464468
URL: http://svn.apache.org/viewvc?view=rev&rev=464468
Log:
Move up to Xerces 2.8.1. I tried using Maven to do it, but the artifacts are
out of date, inconsistent, and with dirty dependencies.
Modified:
ant/core/trunk/fetch.xml
ant/core/trunk/lib/libraries.properties
ant/core/trunk/lib/xercesImpl.jar
ant/core/trunk/lib/xml-apis.jar
Modified: ant/core/trunk/fetch.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/fetch.xml?view=diff&rev=464468&r1=464467&r2=464468
==============================================================================
--- ant/core/trunk/fetch.xml (original)
+++ ant/core/trunk/fetch.xml Mon Oct 16 05:40:48 2006
@@ -63,12 +63,10 @@
<import file="get-m2.xml" />
<target name="pick-dest">
+ <property name="dest" value="system" />
<condition property="dest.dir"
value="${lib.dir}">
- <or>
- <equals arg1="${dest}" arg2="system" />
- <not><isset property="dest"/></not>
- </or>
+ <equals arg1="${dest}" arg2="system" />
</condition>
<condition property="dest.dir"
value="${optional.dir}">
@@ -92,7 +90,7 @@
<attribute name="archive" default="@{project}"/>
<sequential>
<fail>
- Unknown archive @{archive}
+ Unknown archive @{archive} -no property @{archive}.version defined.
<condition>
<not>
<isset property="@{archive}.version"/>
@@ -141,6 +139,21 @@
depends="init">
<f2 project="xalan" />
<f2 project="xml-resolver" />
+ </target>
+
+ <!--
+ 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.
+ -->
+
+ <target name="xerces"
+ description="load an updated version of Xerces"
+ depends="init">
+ <f2 project="xerces" archive="xercesImpl"/>
+ <f2 project="xerces" archive="xmlParserAPIs" />
</target>
<target name="networking"
Modified: ant/core/trunk/lib/libraries.properties
URL:
http://svn.apache.org/viewvc/ant/core/trunk/lib/libraries.properties?view=diff&rev=464468&r1=464467&r2=464468
==============================================================================
--- ant/core/trunk/lib/libraries.properties (original)
+++ ant/core/trunk/lib/libraries.properties Mon Oct 16 05:40:48 2006
@@ -16,6 +16,7 @@
#when a specific dependency forces them to be out-of-order
antlr.version=2.7.2
bcel.version=5.1
+#there is a version 2.4.0, which is what Ant is built against. It is just not
yet in the repo
bsf.version=2.3.0
bsh.version=2.0b4
bsh-core.version=${bsh.version}
@@ -32,7 +33,11 @@
oro.version=2.0.8
regexp.version=1.3
which.version=1.0
-xerces.version=2.6.2
+xerces.version=2.8.1
+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
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=464468&r1=464467&r2=464468
==============================================================================
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=464468&r1=464467&r2=464468
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
