[Jython-checkins] jython: Upgrade xerces to 2.11.0. Also correct missing guava update in build.xml.

[frank.wierzbicki]

http://hg.python.org/jython/rev/e919c10b49d6
changeset:   6967:e919c10b49d6
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Fri Feb 01 11:48:33 2013 -0800
summary:
  Upgrade xerces to 2.11.0. Also correct missing guava update in build.xml.

files:
  .idea/libraries/extlibs.xml   |    3 ++-
  .idea/libraries/extlibs2.xml  |    3 ++-
  b/.idea/libraries/extlibs.xml |    3 ++-
  build.xml                     |    5 +++--
  extlibs/xercesImpl-2.11.0.jar |  Bin 
  extlibs/xercesImpl-2.9.1.jar  |  Bin 
  extlibs/xml-apis-2.11.0.jar   |  Bin 
  7 files changed, 9 insertions(+), 5 deletions(-)


diff --git a/.idea/libraries/extlibs.xml b/.idea/libraries/extlibs.xml
--- a/.idea/libraries/extlibs.xml
+++ b/.idea/libraries/extlibs.xml
@@ -20,7 +20,8 @@
       <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-AIX.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jaffl.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.9.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xml-apis-2.11.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
diff --git a/.idea/libraries/extlibs2.xml b/.idea/libraries/extlibs2.xml
--- a/.idea/libraries/extlibs2.xml
+++ b/.idea/libraries/extlibs2.xml
@@ -23,7 +23,8 @@
       <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/asm-4.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jaffl.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.9.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xml-apis-2.11.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
diff --git a/b/.idea/libraries/extlibs.xml b/b/.idea/libraries/extlibs.xml
--- a/b/.idea/libraries/extlibs.xml
+++ b/b/.idea/libraries/extlibs.xml
@@ -23,7 +23,8 @@
       <root url="jar://$PROJECT_DIR$/extlibs/jffi-ppc-AIX.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/antlr-runtime-3.1.3.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jaffl.jar!/" />
-      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.9.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xercesImpl-2.11.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/extlibs/xml-apis-2.11.0.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/servlet-api-2.5.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jnr-posix.jar!/" />
       <root url="jar://$PROJECT_DIR$/extlibs/jffi-sparcv9-SunOS.jar!/" />
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -642,7 +642,7 @@
             <zipfileset src="extlibs/asm-commons-4.0.jar"/>
             <zipfileset src="extlibs/asm-util-4.0.jar"/>
             <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm. at 1"/>
-            <zipfileset src="extlibs/guava-11.0.2.jar"/>
+            <zipfileset src="extlibs/guava-13.0.1.jar"/>
             <rule pattern="com.google.**" result="org.python.google. at 1"/>
             <zipfileset src="extlibs/jaffl.jar"/>
             <zipfileset src="extlibs/jffi-Darwin.jar"/>
@@ -667,7 +667,8 @@
 			<zipfileset src="${extlibs.dir}/jnr-netdb-1.0.6-SNAPSHOT.jar"/>
 			<zipfileset src="${extlibs.dir}/jnr-posix-2.1-SNAPSHOT.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-constants-0.8.3-SNAPSHOT.jar"/>
-            <zipfileset src="extlibs/xercesImpl-2.9.1.jar" excludes="META-INF/services/*"/>
+            <zipfileset src="extlibs/xml-apis-2.11.0.jar" excludes="META-INF/services/*"/>
+            <zipfileset src="extlibs/xercesImpl-2.11.0.jar" excludes="META-INF/services/*"/>
             <rule pattern="org.apache.xml.**" result="org.python.apache.xml. at 1"/>
             <rule pattern="org.apache.xerces.**" result="org.python.apache.xerces. at 1"/>
             <rule pattern="org.apache.wml.**" result="org.python.apache.wml. at 1"/>
diff --git a/extlibs/xercesImpl-2.11.0.jar b/extlibs/xercesImpl-2.11.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..0aaa990f3ecadf60d28b5395dc87bbe49da0cdd7
GIT binary patch
[stripped]
diff --git a/extlibs/xercesImpl-2.9.1.jar b/extlibs/xercesImpl-2.9.1.jar
deleted file mode 100644
Binary file extlibs/xercesImpl-2.9.1.jar has changed
diff --git a/extlibs/xml-apis-2.11.0.jar b/extlibs/xml-apis-2.11.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..46733464fc746776c331ecc51061f3a05e662fd1
GIT binary patch
[stripped]

-- 
Repository URL: http://hg.python.org/jython