Update Guava to 16.0.1 for CDI compatibility
Bug: issue 8590
Change-Id: Ic12978ffdfe549d2100c0c6948b1864fb051200b
(cherry picked from commit 062daa89de0e454576818c667d2c30ecc7e3f04e)
diff --git a/dev/build.xml b/dev/build.xml
index 7c3219b..7ca791c 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-15.0/guava-15.0-rebased.jar" />
+ <include name="guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
<include name="icu4j/50.1.1/icu4j.jar" />
<include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
<include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
@@ -109,7 +109,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-15.0/guava-15.0-rebased.jar" />
+ <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
<zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar" />
<zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
<zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
@@ -187,7 +187,7 @@
<pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar" />
<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}/guava/guava-15.0/guava-15.0-rebased.jar" />
+ <pathelement location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
<pathelement location="${gwt.tools.lib}/jscomp/20131014/compiler-rebased.jar" />
<pathelement location="${gwt.tools.lib}/jscomp/20131014/sourcemap-rebased.jar" />
<pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar" />
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index 17d1fee..230e0a9 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -21,7 +21,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.5.0/protobuf-java-rebased-2.5.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-15.0/guava-15.0-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131014/sourcemap-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131014/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 bd5f472..53a0b86 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-15.0/guava-15.0-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index b168113..4ebaa24 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -45,7 +45,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-15.0/guava-15.0-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.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/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 9c807f5..c3dfe5f 100644
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -24,7 +24,7 @@
<mkdir dir="${gwt.build.lib}" />
<gwt.jar>
<!-- Rebased dependencies go in gwt-servlet too -->
- <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" />
+ <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
<zipfileset src="${gwt.tools.lib}/jscomp/20131014/sourcemap-rebased.jar" />
<zipfileset src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar" />
<zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
