Update GWT to use guava-15.0 (rebased). Change-Id: I21565e43f6758ea55535a4b6f52b489884a3b677
diff --git a/dev/build.xml b/dev/build.xml index 93cf591..3336974 100755 --- a/dev/build.xml +++ b/dev/build.xml
@@ -58,7 +58,7 @@ <include name="apache/ant-1.6.5.jar" /> <include name="eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" /> <include name="eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" /> - <include name="guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> + <include name="guava/guava-15.0/guava-15.0-rebased.jar" /> <include name="jscomp/r1649/compiler-rebased.jar" /> <include name="jetty/jetty-6.1.11.jar" /> <include name="icu4j/50.1.1/icu4j.jar" /> @@ -91,7 +91,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-10.0.1/guava-10.0.1-rebased.jar" /> + <include name="guava/guava-15.0/guava-15.0-rebased.jar" /> <include name="jscomp/r1649/compiler-rebased.jar" /> </fileset> <fileset dir="${gwt.tools.redist}"> @@ -108,7 +108,7 @@ <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" /> <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" /> <zipfileset src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> + <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-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/50.1.1/icu4j.jar" /> @@ -141,7 +141,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-10.0.1/guava-10.0.1-rebased.jar" /> + <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/jscomp/r1649/compiler-rebased.jar" /> <zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" /> </gwt.jar> @@ -185,7 +185,7 @@ <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" /> <pathelement location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" /> <pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar" /> - <pathelement location="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> + <pathelement location="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-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 5af023d..d223745 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -20,7 +20,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-10.0.1/guava-10.0.1-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-15.0/guava-15.0-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="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/>
diff --git a/eclipse/dev/compiler/.classpath b/eclipse/dev/compiler/.classpath index a951438..bd5f472 100644 --- a/eclipse/dev/compiler/.classpath +++ b/eclipse/dev/compiler/.classpath
@@ -8,6 +8,6 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar"/> <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-10.0.1/guava-10.0.1-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-15.0/guava-15.0-rebased.jar"/> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath index 42172aa..5c9adf3 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-10.0.1/guava-10.0.1-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-15.0/guava-15.0-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/50.1.1/icu4j.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/javax/activation/activation-1.1.jar"/>
diff --git a/servlet/build.xml b/servlet/build.xml index 690c1e1..a757614 100644 --- a/servlet/build.xml +++ b/servlet/build.xml
@@ -54,7 +54,7 @@ <zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" /> <zipfileset src="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" /> <zipfileset src="${gwt.tools.lib}/jscomp/sourcemap-rebased.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-10.0.1/guava-10.0.1-rebased.jar" /> + <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" /> <zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" /> </gwt.jar> </target>