diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-11-22 09:46:36 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-11-22 09:46:36 +0000 |
| commit | 1810b99839cb5616e84722c1f767953b7093a08b (patch) | |
| tree | b11b0a82fcf7d112fe235bc21c60226f89a6c8a8 /shared | |
| parent | 7c77d31a9f9a31202e6379d34fde178c18674efe (diff) | |
| parent | 42146cf3aea80fc0b14345e9c0db969b669a26bf (diff) | |
| download | vaadin-framework-1810b99839cb5616e84722c1f767953b7093a08b.tar.gz vaadin-framework-1810b99839cb5616e84722c1f767953b7093a08b.zip | |
Merge "Use json from vaadin-shared-deps 1.0.1 (#10118)"
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/ivy.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/shared/ivy.xml b/shared/ivy.xml index 4cd0df88a1..1d268083d7 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -20,10 +20,8 @@ <artifact type="pom" ext="pom" /> </publications> <dependencies> - <dependency org="org.json" name="json" rev="20080701" - conf="build,ide,tests->default" /> <dependency org="com.vaadin" name="vaadin-shared-deps" - rev="1.0.0" conf="build,ide,tests->default" /> + rev="1.0.1" conf="build,ide,tests->default" /> </dependencies> </ivy-module> |