diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-05-05 11:41:09 +0300 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-05-05 11:43:28 +0300 |
| commit | 0745a29a958950b47dbc178d2c3f8c1f38c2af55 (patch) | |
| tree | 8ee16701bec4b37e7a0601ec6bae97f34052bea1 /uitest/ivy.xml | |
| parent | 2efe580cb8dbd185fc154a7c7d6acb7efc4f16d5 (diff) | |
| parent | 2c8c29e68b002ac6c498c3046a41822111c6d4ab (diff) | |
| download | vaadin-framework-0745a29a958950b47dbc178d2c3f8c1f38c2af55.tar.gz vaadin-framework-0745a29a958950b47dbc178d2c3f8c1f38c2af55.zip | |
Merge changes from origin/7.2 into master
Conflicts:
build.properties
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/server/Responsive.java
Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864
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 27441b0f1a..f54ea7270e 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" |