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

diff --git a/WebContent/license.html b/WebContent/license.html
index d984717773353dea69ba761d956394dd1f47ca74..e1b0bed54a7e35589815c63d6cdd48dd691be955 100644 (file)
--- a/WebContent/license.html
+++ b/WebContent/license.html
@@ -99,7 +99,7 @@
           <!-- In vaadin-shared-deps -->
           <tr>
             <td>JSON</td>
-            <td><a href="licenses/apache-license-version-2-0.txt">Apache License, Version 2.0</a></td>
+            <td><a href="licenses/the-json-license.txt">The JSON License</a></td>
           </tr>
 
           <!-- Used by vaadin-server -->

diff --git a/build.properties b/build.properties
index 0fc074ce69f2adec2d94b8545041c5b27d48abc2..1c8268ee472cc593fe1f342f60e3a807439723c4 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -6,5 +6,5 @@ vaadin.url=http://vaadin.com
 vaadin.java.version=1.6
 vaadin.version=0.0.0.unversioned-development-build
 vaadin.sass.version=0.9.6
-gwt.version=2.6.0.vaadin2
+gwt.version=2.6.0.vaadin3
 commons-io.version=2.4

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