Merge change from /harmony/enhanced/java/trunk@1043536:

r1043536 | tellison | 2010-12-08 17:24:53 +0000 (Wed, 08 Dec 2010) | 1 line Update to Xerces 2.11.0 git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/branches/java6@1043884 13f79535-47bb-0310-9956-ffa450edef68
varialus · Dec 9, 2010 · 76185b2 · 76185b2
1 parent 69ed0c7
commit 76185b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/classlib/depends/files/bootclasspath.properties b/classlib/depends/files/bootclasspath.properties
@@ -170,9 +170,9 @@ bootclasspath.33=icu4j_4.4.1.1/icu4j-charsets-4_4_1_1.jar
 
 # The following JARs are from Xerces/Xalan
 bootclasspath.34=xalan-j_2.7.0/xalan.jar
-bootclasspath.35=xerces_2.10.0/resolver.jar
-bootclasspath.36=xerces_2.10.0/xercesImpl.jar
-bootclasspath.37=xerces_2.10.0/xml-apis.jar
+bootclasspath.35=xerces_2.11.0/resolver.jar
+bootclasspath.36=xerces_2.11.0/xercesImpl.jar
+bootclasspath.37=xerces_2.11.0/xml-apis.jar
 
 # The following JARs are from mx4j.sf.net
 bootclasspath.38=mx4j_3.0.2/mx4j.jar

diff --git a/classlib/make/depends.properties b/classlib/make/depends.properties
@@ -26,10 +26,10 @@ xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.dir=${depends.jars}/xerces_2.10.0
+xerces.dir=${depends.jars}/xerces_2.11.0
 xerces.zip=${xerces.dir}/xerces.zip
-xerces.url=http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.10.0.zip
-xerces.md5=8da14a7b2848eff131b7cc10668887e8
+xerces.url=http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.11.0.zip
+xerces.md5=408500aaaf1ff9f1e03e79defe90facc
 
 junit.dir=${depends.jars}/junit_4.6
 junit.jar=${junit.dir}/junit-4.6.jar

diff --git a/classlib/modules/xml/build.xml b/classlib/modules/xml/build.xml
@@ -51,7 +51,7 @@
     <target name="-extract-xerces" unless="xerces.uptodate">
         <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
         <copy todir="${xerces.dir}" flatten="yes">
-            <fileset dir="${xerces.dir}.tmp/xerces-2_10_0">
+            <fileset dir="${xerces.dir}.tmp/xerces-2_11_0">
                 <include name="resolver.jar" />
 		<include name="xercesImpl.jar" />
 		<include name="xml-apis.jar" />

diff --git a/...ifests/xerces_2.10.0/META-INF/MANIFEST.MF → ...ifests/xerces_2.11.0/META-INF/MANIFEST.MF b/...ifests/xerces_2.10.0/META-INF/MANIFEST.MF → ...ifests/xerces_2.11.0/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Harmony XML Xerces
 Bundle-SymbolicName: org.apache.harmony.xml.xerces
-Bundle-Version: 2.10.0
+Bundle-Version: 2.11.0
 Bundle-ClassPath: resolver.jar,xercesImpl.jar,xml-apis.jar
 Eclipse-JREBundle: true
 Export-Package: javax.xml,

diff --git a/classlib/modules/xml/make/depends.properties b/classlib/modules/xml/make/depends.properties
@@ -23,7 +23,7 @@ xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/${xalan.version}/xalan-${xalan.version}.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.version=2.10.0
+xerces.version=2.11.0
 xerces.base=xerces_${xerces.version}
 xerces.dir=${depends.jars}/${xerces.base}
 xerces.zip=${xerces.dir}/xerces.zip

diff --git a/common_resources/make/depends.properties b/common_resources/make/depends.properties
@@ -73,10 +73,10 @@ xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.dir=${depends.jars}/xerces_2.10.0
+xerces.dir=${depends.jars}/xerces_2.11.0
 xerces.zip=${xerces.dir}/xerces.zip
-xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.10.0.zip
-xerces.md5=8da14a7b2848eff131b7cc10668887e8
+xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.11.0.zip
+xerces.md5=408500aaaf1ff9f1e03e79defe90facc
 
 msvcr.dir.x86=${hy.depends}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll