Modify the version of xalan-2.7.1.jar used to stop including an old version of the Java Cup runtime (version .10). Add java-cup-11a.jar (version .11a) to the tools/lib directory.
Review at http://gwt-code-reviews.appspot.com/1404801
Review by: fabbott@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10032 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml
index 6782911..0d6cfc0 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -102,7 +102,8 @@
<include name="htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" />
<include name="nekohtml/nekohtml-1.9.13.jar" />
<include name="streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
- <include name="xalan/xalan-2.7.1.jar" />
+ <include name="cup/java-cup-11a.jar" />
+ <include name="xalan/xalan-2.7.1-nocup.jar" />
<include name="xerces/xerces-2_9_1/serializer.jar" />
<include name="xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
<include name="xerces/xerces-2_9_1/xml-apis.jar" />
@@ -165,7 +166,8 @@
<zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-r5940.jar" />
<zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-r5940/htmlunit-core-js-r5940.jar" />
<zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.13.jar" />
- <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar" />
+ <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar" />
<zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/serializer.jar" />
<zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar" />
<zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" />
diff --git a/eclipse/external/cldr-tools/.classpath b/eclipse/external/cldr-tools/.classpath
index 6225a5e..60d2da3 100644
--- a/eclipse/external/cldr-tools/.classpath
+++ b/eclipse/external/cldr-tools/.classpath
@@ -2,7 +2,8 @@
<classpath>
<classpathentry excluding="org/unicode/cldr/web/|org/unicode/cldr/tool/templates/" kind="src" path="java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/cup/java-cup-11a.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1-nocup.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.7.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/4.4.2/icu4j.jar" sourcepath="/GWT_TOOLS/lib/icu4j/4.4.2/icu4jsrc.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/4.4.2/utilities.jar" sourcepath="/GWT_TOOLS/lib/icu4j/4.4.2/icu4jsrc.jar"/>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 04674b8..eb6dfd2 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -21,7 +21,8 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/cssparser/cssparser-0.9.5.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.13.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar" sourcepath="/GWT_TOOLS/lib/selenium/selenium-java-client-driver-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/cup/java-cup-11a.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1-nocup.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/serializer.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xercesImpl-NoMetaInf.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xerces/xerces-2_9_1/xml-apis.jar"/>
