Browse Source

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

Change-Id: Ia65d8bfb76842060c4f0a859588a75fb9b167900
tags/7.0.0.beta6
Artur Signell 11 years ago
parent
commit
d404e3903a
2 changed files with 3 additions and 5 deletions
  1. 1
    5
      gwt-files.xml
  2. 2
    0
      shared/ivy.xml

+ 1
- 5
gwt-files.xml View File

@@ -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">

+ 2
- 0
shared/ivy.xml View File

@@ -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>

Loading…
Cancel
Save