diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2017-02-01 19:13:08 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-02-01 19:13:08 +0200 |
| commit | 6c624e86e39d8dc59452a2ce3e182d78b1f9eaeb (patch) | |
| tree | add20750a4ee6a729cf828af25e685b1981b76b7 /test/servlet-containers | |
| parent | 53674a7cafc22e8e21f5a7d46df0f5c126fb76c6 (diff) | |
| download | vaadin-framework-6c624e86e39d8dc59452a2ce3e182d78b1f9eaeb.tar.gz vaadin-framework-6c624e86e39d8dc59452a2ce3e182d78b1f9eaeb.zip | |
Replace FontAwesome with Vaadin Icons (#8208)
* Include FontAwesome by default for easier migration
* Fix JSComponentLoadingIndicatorTest
Fixes #7979
Addresses part of #8219
Diffstat (limited to 'test/servlet-containers')
| -rw-r--r-- | test/servlet-containers/generic/ivy.xml | 4 | ||||
| -rw-r--r-- | test/servlet-containers/generic/ivysettings.xml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test/servlet-containers/generic/ivy.xml b/test/servlet-containers/generic/ivy.xml index 33ac7c7c04..6046e60620 100644 --- a/test/servlet-containers/generic/ivy.xml +++ b/test/servlet-containers/generic/ivy.xml @@ -68,6 +68,10 @@ <exclude org="javax.servlet"></exclude> <exclude type="pom" /> </dependency> + <dependency org="com.vaadin" name="vaadin-icons" rev="3.0.0" + conf="build->default"> + <exclude type="pom" /> + </dependency> <!-- For compiling TestingWidgetSet --> <dependency org="com.vaadin" name="vaadin-client-compiler" diff --git a/test/servlet-containers/generic/ivysettings.xml b/test/servlet-containers/generic/ivysettings.xml index f28250c3c1..07f22ee125 100644 --- a/test/servlet-containers/generic/ivysettings.xml +++ b/test/servlet-containers/generic/ivysettings.xml @@ -71,6 +71,8 @@ resolver="vaadin-maven" /> <module organisation="com.vaadin" name="vaadin-uitest-common" resolver="vaadin-maven" /> + <module organisation="com.vaadin" name="vaadin-icons" + resolver="vaadin-maven" /> </modules> |