diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-04 08:55:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-10-04 11:46:17 +0300 |
| commit | d404e3903a6507fb567e7df41a5d6997bdc5bb4e (patch) | |
| tree | 2a51ee7477be49ab370f25c6e92ef7f233fde18b | |
| parent | f41265f8bd86d2d17d1f99339314c33d968e77f4 (diff) | |
| download | vaadin-framework-d404e3903a6507fb567e7df41a5d6997bdc5bb4e.tar.gz vaadin-framework-d404e3903a6507fb567e7df41a5d6997bdc5bb4e.zip | |
Use rebased Guava from vaadin-shared-deps (#9612)
Change-Id: Ia65d8bfb76842060c4f0a859588a75fb9b167900
| -rw-r--r-- | gwt-files.xml | 6 | ||||
| -rw-r--r-- | shared/ivy.xml | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/gwt-files.xml b/gwt-files.xml index 89549f0553..b25a30e00c 100644 --- 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 2c4b65a389..4cd0df88a1 100644 --- 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> |