diff options
author | Build Agent <build@vaadin.com> | 2014-04-16 15:09:25 +0300 |
---|---|---|
committer | Build Agent <build@vaadin.com> | 2014-04-16 15:09:26 +0300 |
commit | 4015bd18e05cd26e73bfcd028bd261172ab82290 (patch) | |
tree | b79e99653cd8d4efd3224a88ffc593f53506bb9a /uitest/ivy.xml | |
parent | 202514e6c03877b40bbb17fbb74cf4d68eb21503 (diff) | |
parent | 5057c59a02b6570f6a314dee3379688f0a48981b (diff) | |
download | vaadin-framework-4015bd18e05cd26e73bfcd028bd261172ab82290.tar.gz vaadin-framework-4015bd18e05cd26e73bfcd028bd261172ab82290.zip |
Merge changes from origin/7.1
08b0589 Refactored TimeoutRedirectResetsOnActivity tests.
5057c59 Added integration test for WebSphere Portal. (#13309)
Change-Id: I50c8a8f6513679dca611889b43782d6ee6089d6c
Diffstat (limited to 'uitest/ivy.xml')
-rw-r--r-- | uitest/ivy.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 170ffd21cf..ea22172937 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -57,7 +57,9 @@ <!-- For compiling TestingWidgetSet --> <dependency org="com.vaadin" name="vaadin-client-compiler" - rev="${vaadin.version}" conf="build-provided-> build"></dependency> + rev="${vaadin.version}" conf="build-provided-> build"> + <exclude type="pom" /> + </dependency> <!-- Servlet 3.0 API --> <dependency org="javax.servlet" name="javax.servlet-api" |