Update to new GWT which also uses the correct org.json dependency Change-Id: I9414be188bf59975d01186a9daf83f0c170a88bctags/7.3.0.beta1
@@ -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 --> |
@@ -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 |
@@ -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" /> | |||