diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-03-04 11:30:56 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-03-04 11:30:56 +0200 |
| commit | 5b311a9cf2510cf1f31e847aac88b7ba3efa2a5b (patch) | |
| tree | cded611f521b28c2fa91785e48f009d43100aee4 /uitest/ivy.xml | |
| parent | 6b7ad587042d2c98c2133c93382fb5ea8cdded8c (diff) | |
| parent | 5dffe132bc98853832431424da5755d8d8d820e4 (diff) | |
| download | vaadin-framework-5b311a9cf2510cf1f31e847aac88b7ba3efa2a5b.tar.gz vaadin-framework-5b311a9cf2510cf1f31e847aac88b7ba3efa2a5b.zip | |
Merge commit '5dffe132bc98853832431424da5755d8d8d820e4'
Conflicts:
uitest/ivy.xml
Change-Id: I5fea7895be1e93a8f97c6926fc2cafb401603a49
Diffstat (limited to 'uitest/ivy.xml')
| -rw-r--r-- | uitest/ivy.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 6270ec54de..03b57a30e5 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -83,7 +83,7 @@ <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="build,ide -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="3.1.2" conf="build-provided,ide -> default" /> + rev="3.1.3" conf="build-provided,ide -> default" /> <!-- This should be removed once tests have been updated to use lang3 --> <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="build,ide -> default" /> |