Reviewers: rice,
Description:
Fixes rebased guava library without using JarJar
Fixes Issue
http://code.google.com/p/google-web-toolkit/issues/detail?id=5708
Review by: r...@google.com
Please review this at http://gwt-code-reviews.appspot.com/1213801/show
Affected files:
M dev/build.xml
Index: dev/build.xml
===================================================================
--- dev/build.xml (revision 9407)
+++ dev/build.xml (working copy)
@@ -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.jar" />
+ <include name="guava/guava-r06/guava-r06-rebased-2.jar" />
<include name="jetty/jetty-6.1.11.jar" />
<include name="icu4j/4.4.2/icu4j.jar" />
<include
name="protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar" />
@@ -109,7 +109,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.jar" />
+ <include name="guava/guava-r06/guava-r06-rebased-2.jar" />
</fileset>
<fileset file="build.xml"/>
</sourcefiles>
@@ -121,7 +121,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.jar" />
+ <zipfileset
src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
<zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" />
<zipfileset src="${gwt.tools.lib}/icu4j/4.4.2/icu4j.jar" />
<zipfileset
src="${gwt.tools.lib}/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"
/>
@@ -172,7 +172,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.jar" />
+ <zipfileset
src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
</gwt.jar>
</sequential>
</outofdate>
@@ -214,7 +214,7 @@
<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}/junit/junit-3.8.1.jar" />
- <pathelement
location="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased.jar" />
+ <pathelement
location="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" />
</classpath>
</gwt.javac>
</target>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
