From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Mon, 10 Feb 2014 09:46:33 +0000 (+0200)
Subject: Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master
X-Git-Tag: 7.2.0.beta1~173
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8748aeed2ac3a7614e2775fe14348bd866a5538d;p=vaadin-framework.git

Merge commit '691580e36b1b5a04e1f18004783b28ca9892fa31' into master

691580e Update TestBench dependency to 3.1.2

Conflicts:
	uitest/ivy.xml

Change-Id: Ic2a767595791f0730a209d833f6b9d0fcaaa4efe
---

8748aeed2ac3a7614e2775fe14348bd866a5538d
diff --cc uitest/ivy.xml
index 0508d10b57,352cd89f2e..6270ec54de
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@@ -83,11 -83,7 +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>