diff options
| author | Artur Signell <artur@vaadin.com> | 2014-06-27 15:49:26 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-06-30 05:31:43 +0000 |
| commit | 9ceac5b2a8e9541c012b90f72d5f222ec508556e (patch) | |
| tree | 66a2b5e04f51e16b51d25906894a1e674c8fae8c /shared | |
| parent | 0ba894d63b83f44aa77b925a9bda127c82237d75 (diff) | |
| download | vaadin-framework-9ceac5b2a8e9541c012b90f72d5f222ec508556e.tar.gz vaadin-framework-9ceac5b2a8e9541c012b90f72d5f222ec508556e.zip | |
Revert to org.json as Android JSON is not 100% compatible (#13944)
Update to new GWT which also uses the correct org.json dependency
Change-Id: I9414be188bf59975d01186a9daf83f0c170a88bc
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/ivy.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/ivy.xml b/shared/ivy.xml index 3dfe1a51c2..2dac7adbc2 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -27,8 +27,8 @@ 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="com.vaadin.external.json" name="json" + rev="0.0.20080701" conf="build,ide,test->default" /> <dependency org="junit" name="junit" rev="4.11" conf="test,ide -> default" /> |