aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-03-13 18:25:26 +0000
committerVaadin Code Review <review@vaadin.com>2014-03-13 18:25:43 +0000
commit51431580addd52aa9afacd4ed8bf31c0c125c0bb (patch)
tree29721a8a9293cea275954a6a18882a381cbce5e4
parent18b66b9fe767e39fa42c8e3631a3d273c0f30a59 (diff)
downloadvaadin-framework-51431580addd52aa9afacd4ed8bf31c0c125c0bb.tar.gz
vaadin-framework-51431580addd52aa9afacd4ed8bf31c0c125c0bb.zip
Revert "Use Guava 16 which does not have compatibility issues"
Turns out Smartsprites uses Closeables.closeQuietly which is deprecated in 15 and removed in Guava 16 This reverts commit 1159db580f350493ffcf6628c05924458881ebb2. Change-Id: Ica9b4e175041b00a15a320b7c3fcea5b6d42b349
-rw-r--r--theme-compiler/ivy.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 7072176d4e..0f84966508 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -48,7 +48,6 @@
<!-- Internally used, for now -->
<dependency org="com.carrotsearch" name="smartsprites"
rev="0.2.10" />
- <override org="com.google.guava" module="guava" rev="16.0.1" />
<!-- Use the same commons-io as the rest of the project -->
<override org="commons-io" module="commons-io" rev="2.2" />
</dependencies>