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

1 files changed, 2 insertions, 2 deletions

diff --git a/server/src/com/vaadin/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java
index 129307e5c1..d05922b40d 100644
--- 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);
     }