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

diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java
index 129307e5c1c859720b3a3848ef7ad7f55c429f18..d05922b40d47729955fc12d2dad3950cdaa14fe9 100644 (file)
--- a/server/src/com/vaadin/server/JsonCodec.java
+++ b/server/src/com/vaadin/server/JsonCodec.java
@@ -617,7 +617,7 @@ public class JsonCodec implements Serializable {
 
             return decodedObject;
         } catch (Exception e) {
-            throw new JSONException(e);
+            throw new JSONException(e.getMessage());
         }
     }
 
@@ -765,7 +765,7 @@ public class JsonCodec implements Serializable {
             }
         } catch (Exception e) {
             // TODO: Should exceptions be handled in a different way?
-            throw new JSONException(e);
+            throw new JSONException(e.getMessage());
         }
         return new EncodeResult(encoded, diff);
     }

diff --git a/shared/ivy.xml b/shared/ivy.xml
index 169a52034dd76a85c2bc018eeba4c41adfb0f093..3dfe1a51c2838108ce91339df28b5a8caa547d1b 100644 (file)
--- 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" />