Author: hindessm
Date: Thu Dec 9 10:22:23 2010
New Revision: 1043884
URL: http://svn.apache.org/viewvc?rev=1043884&view=rev
Log:
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
Added:
harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.11.0/
- copied from r1043536, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.11.0/
harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.11.0/META-INF/
- copied from r1043536, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.11.0/META-INF/
harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.11.0/META-INF/MANIFEST.MF
- copied unchanged from r1043536, harmony/enhanced/java/trunk/classlib/modules/xml/depends/manifests/xerces_2.11.0/META-INF/MANIFEST.MF
Removed:
harmony/enhanced/java/branches/java6/classlib/modules/xml/depends/manifests/xerces_2.10.0/
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/files/bootclasspath.properties
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/classlib/make/depends.properties
harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml
harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties
harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 10:22:23 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349
+/harmony/enhanced/java/trunk:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 10:22:23 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349
+/harmony/enhanced/java/trunk/classlib:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/depends/files/bootclasspath.properties?rev=1043884&r1=1043883&r2=1043884&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/depends/files/bootclasspath.properties Thu
Dec 9 10:22:23 2010
@@ -170,9 +170,9 @@ bootclasspath.33=icu4j_4.4.1.1/icu4j-cha
# 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
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 10:22:23 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Modified: harmony/enhanced/java/branches/java6/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/make/depends.properties?rev=1043884&r1=1043883&r2=1043884&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/make/depends.properties Thu Dec 9 10:22:23
2010
@@ -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
Modified: harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml?rev=1043884&r1=1043883&r2=1043884&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/xml/build.xml Thu Dec 9 10:22:23
2010
@@ -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" />
Modified: harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties?rev=1043884&r1=1043883&r2=1043884&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/xml/make/depends.properties Thu
Dec 9 10:22:23 2010
@@ -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
Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.properties?rev=1043884&r1=1043883&r2=1043884&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.properties Thu Dec
9 10:22:23 2010
@@ -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
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 10:22:23 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349
+/harmony/enhanced/java/trunk/drlvm:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 9 10:22:23 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349
+/harmony/enhanced/java/trunk/jdktools:929253-1029636,1029773,1029853,1030005,1033407,1035930,1038506,1043349,1043536
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147
|