From 6b7ad587042d2c98c2133c93382fb5ea8cdded8c Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 28 Feb 2014 23:24:38 +0200
Subject: Use separate dependencies instead of shared-deps

* Use Guava 16 for CDI compatibility (#13351, #13383)
* Use Android Json instead of org.json (#13277)

Change-Id: I4f2c2b5c56afb03d09b41a040dec7d60b4563fe8
---
 shared/ivy.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'shared')

diff --git a/shared/ivy.xml b/shared/ivy.xml
index 169a52034d..3dfe1a51c2 100644
--- a/shared/ivy.xml
+++ b/shared/ivy.xml
@@ -20,9 +20,15 @@
         <artifact type="pom" ext="pom" />
     </publications>
     <dependencies>
-        <dependency org="com.vaadin" name="vaadin-shared-deps"
-            rev="1.0.3" conf="build,ide,test->default" />
-
+        <dependency org="com.vaadin.external.flute" name="flute"
+            rev="1.3.0.gg2" conf="build,ide,test->default" />
+        <dependency org="com.vaadin.external.streamhtmlparser"
+            name="streamhtmlparser-jsilver" rev="0.0.10.vaadin1"
+            conf="build,ide,test->default" />
+        <dependency org="com.vaadin.external.google" name="guava"
+            rev="16.0.1.vaadin1" conf="build,ide,test->default" />
+        <dependency org="com.vaadin.external.google" name="android-json"
+            rev="0.0.20131108.vaadin1" conf="build,ide,test->default" />
         <dependency org="junit" name="junit" rev="4.11"
             conf="test,ide -> default" />
 
-- 
cgit v1.2.3