From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 4 Mar 2014 09:30:56 +0000 (+0200)
Subject: Merge commit '5dffe132bc98853832431424da5755d8d8d820e4'
X-Git-Tag: 7.2.0.beta1~138
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5b311a9cf2510cf1f31e847aac88b7ba3efa2a5b;p=vaadin-framework.git

Merge commit '5dffe132bc98853832431424da5755d8d8d820e4'

Conflicts:
	uitest/ivy.xml

Change-Id: I5fea7895be1e93a8f97c6926fc2cafb401603a49
---

5b311a9cf2510cf1f31e847aac88b7ba3efa2a5b
diff --cc uitest/ivy.xml
index 6270ec54de,91c049b551..03b57a30e5
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@@ -83,10 -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.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" />
      </dependencies>
  
  </ivy-module>