diff options
author | Artur Signell <artur@vaadin.com> | 2012-10-05 08:29:46 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-10-05 08:29:46 +0000 |
commit | 846dcd7148fc10738f4aee13ae14eddeb67e146a (patch) | |
tree | f48a5211ec2aaec50c9189d9541f8b796cd73c87 /shared/ivy.xml | |
parent | a50d8e803a4f216de959b2789585a062f7a1be76 (diff) | |
parent | ed0d461591780c6f2d60dc6b8aa878fbba6cf197 (diff) | |
download | vaadin-framework-846dcd7148fc10738f4aee13ae14eddeb67e146a.tar.gz vaadin-framework-846dcd7148fc10738f4aee13ae14eddeb67e146a.zip |
Merge changes I0cc40f7c,Ia65d8bfb,I03ad3d60
* changes:
Declared dependencies for jars found in Maven (#9852)
Use rebased Guava from vaadin-shared-deps (#9612)
Use Flute from vaadin-shared-deps (#9612)
Diffstat (limited to 'shared/ivy.xml')
-rw-r--r-- | shared/ivy.xml | 2 |
1 files changed, 2 insertions, 0 deletions
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> |