diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 11:46:33 +0200 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 11:46:33 +0200 |
| commit | 8748aeed2ac3a7614e2775fe14348bd866a5538d (patch) | |
| tree | 0310b434f7c3cfb1ddc0abd0049f44785f5c002a /uitest/ivy.xml | |
| parent | 5284b8b28424c18dd8eb869ca97a6e8457d999b6 (diff) | |
| parent | 691580e36b1b5a04e1f18004783b28ca9892fa31 (diff) | |
| download | vaadin-framework-8748aeed2ac3a7614e2775fe14348bd866a5538d.tar.gz vaadin-framework-8748aeed2ac3a7614e2775fe14348bd866a5538d.zip | |
Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master
691580e Update TestBench dependency to 3.1.2
Conflicts:
uitest/ivy.xml
Change-Id: Ic2a767595791f0730a209d833f6b9d0fcaaa4efe
Diffstat (limited to 'uitest/ivy.xml')
| -rw-r--r-- | uitest/ivy.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 0508d10b57..6270ec54de 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -83,11 +83,10 @@ <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="build,ide -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="3.1.1" conf="build-provided,ide -> default" /> + rev="3.1.2" 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" /> - </dependencies> </ivy-module> |