Upgrade GWT's Guava library to 10.0.1 Review by: johnlenz@google.com git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10793 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml index bd27215..fc6e5f8 100755 --- a/dev/build.xml +++ b/dev/build.xml
@@ -58,7 +58,7 @@ <include name="apache/tapestry-util-text-4.0.2.jar" /> <include name="apache/ant-1.6.5.jar" /> <include name="eclipse/jdt-3.4.2.jar" /> - <include name="guava/guava-r06/guava-r06-rebased-2.jar" /> + <include name="guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> <include name="jscomp/r1649/compiler-rebased.jar" /> <include name="jetty/jetty-6.1.11.jar" /> <include name="icu4j/4.4.2/icu4j.jar" /> @@ -111,7 +111,7 @@ <include name="w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> <include name="sun/swingworker/swing-worker-1.1.jar" /> - <include name="guava/guava-r06/guava-r06-rebased-2.jar" /> + <include name="guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> <include name="jscomp/r1649/compiler-rebased.jar" /> </fileset> <fileset file="build.xml"/> @@ -124,7 +124,7 @@ <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" /> <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" /> + <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" /> <zipfileset src="${gwt.tools.lib}/icu4j/4.4.2/icu4j.jar" /> @@ -177,7 +177,7 @@ <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" /> + <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" /> </gwt.jar> </sequential> @@ -219,7 +219,7 @@ <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" /> <pathelement location="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" /> - <pathelement location="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" /> + <pathelement location="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> <pathelement location="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" /> </classpath> </gwt.javac>
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath index 84d4264..db82e42 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -39,7 +39,7 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-core-js-2.9.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-core-js-2.9-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-2.9.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-2.9-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-10.0.1/guava-10.0.1-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/sourcemap-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/r1649/compiler-rebased.jar"/> <classpathentry kind="output" path="bin"/>
diff --git a/eclipse/dev/compiler/.classpath b/eclipse/dev/compiler/.classpath index 5f9bd71..c74a6e5 100644 --- a/eclipse/dev/compiler/.classpath +++ b/eclipse/dev/compiler/.classpath
@@ -7,6 +7,6 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.4.2.jar" sourcepath="/GWT_TOOLS/lib/eclipse/jdt-3.4.2-src.zip"/> <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/> <classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/commons-collections-3.1.jar" sourcepath="/GWT_TOOLS/lib/tomcat/commons-collections-3.1-src.zip"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-10.0.1/guava-10.0.1-rebased.jar"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath index 67505b8..fbbbd48 100644 --- a/eclipse/user/.classpath +++ b/eclipse/user/.classpath
@@ -44,7 +44,7 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/log4j/log4j-1.2.16.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-r06/guava-r06-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-10.0.1/guava-10.0.1-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/4.4.2/icu4j.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/javax/activation/activation-1.1.jar"/>