Use rebased Guava from vaadin-shared-deps (#9612)

Change-Id: Ia65d8bfb76842060c4f0a859588a75fb9b167900

diff --git a/gwt-files.xml b/gwt-files.xml
index 89549f05532c44bcad18e5db412d62bace83b418..b25a30e00cb1c8690f18b86dde5210345630cb8f 100644 (file)
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -49,7 +49,7 @@
                        <exclude name="license*" />
                        <exclude name="LICENSE*" />
 
-                       <!-- Used by client and server apparently... -->
+                       <!-- Package in vaadin-shared-deps.jar -->
                        <exclude name="com/google/gwt/thirdparty/guava/**" />
 
                        <!-- Overridden in Vaadin -->
@@ -110,10 +110,6 @@
                        <include name="com/google/gwt/*/*/shared/**" />
                        <include name="com/google/web/bindery/*/shared/**" />
                </fileset>
-               <fileset dir="${gwt.dev.jar.files}">
-                       <!-- Used by client and server apparently... -->
-                       <include name="com/google/gwt/thirdparty/guava/**" />
-               </fileset>
        </union>
 
        <union id="server.gwt.includes">

diff --git a/shared/ivy.xml b/shared/ivy.xml
index 2c4b65a389616adec71170c1a2bfddaefbd4eb49..4cd0df88a193f81066259781ae2d6dbc9a988f95 100644 (file)
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -22,6 +22,8 @@
     <dependencies>
         <dependency org="org.json" name="json" rev="20080701"
             conf="build,ide,tests->default" />
+        <dependency org="com.vaadin" name="vaadin-shared-deps"
+            rev="1.0.0" conf="build,ide,tests->default" />
     </dependencies>
 
 </ivy-module>