diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-25 21:01:59 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-25 21:54:19 +0200 |
| commit | 32d319ebf8bee29252f280c0764dc7f2e83de75f (patch) | |
| tree | d0c0870aa265488a9057773c2f2781945efd9147 | |
| parent | 40ad7734266c447222907bc37c2c2719aed674ed (diff) | |
| download | vaadin-framework-32d319ebf8bee29252f280c0764dc7f2e83de75f.tar.gz vaadin-framework-32d319ebf8bee29252f280c0764dc7f2e83de75f.zip | |
Fixed pom fails in unit tests.
Change-Id: I0acbde16576dc26c36031038fe905695581c682d
| -rw-r--r-- | client/ivy.xml | 8 | ||||
| -rw-r--r-- | server/ivy.xml | 12 | ||||
| -rw-r--r-- | theme-compiler/ivy.xml | 4 | ||||
| -rw-r--r-- | uitest/ivy.xml | 14 |
4 files changed, 29 insertions, 9 deletions
diff --git a/client/ivy.xml b/client/ivy.xml index ccc304be3d..3abdcf9ba5 100644 --- a/client/ivy.xml +++ b/client/ivy.xml @@ -25,9 +25,13 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build,test->build"></dependency> + rev="${vaadin.version}" conf="build,test->build"> + <exclude type="pom" conf="test" /> + </dependency> <dependency org="com.vaadin" name="vaadin-server" - rev="${vaadin.version}" conf="build,test->build"></dependency> + rev="${vaadin.version}" conf="build,test->build"> + <exclude type="pom" conf="test" /> + </dependency> <!-- gwt-user dependencies --> <dependency org="org.w3c.css" name="sac" rev="1.3" /> diff --git a/server/ivy.xml b/server/ivy.xml index 2967d25f32..638cc299d0 100644 --- a/server/ivy.xml +++ b/server/ivy.xml @@ -45,11 +45,17 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build,test->build" /> + rev="${vaadin.version}" conf="build,test->build"> + <exclude type="pom" conf="test" /> + </dependency> <dependency org="com.vaadin" name="vaadin-theme-compiler" - rev="${vaadin.version}" conf="build,test->build" /> + rev="${vaadin.version}" conf="build,test->build"> + <exclude type="pom" conf="test" /> + </dependency> <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" - conf="build-provided,test->build" /> + conf="build-provided,test->build"> + <exclude type="pom" conf="test" /> + </dependency> <!-- Jsoup for BootstrapHandler --> <dependency org="org.jsoup" name="jsoup" rev="1.6.3" diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml index 0f84966508..ccd00a29d9 100644 --- a/theme-compiler/ivy.xml +++ b/theme-compiler/ivy.xml @@ -23,7 +23,9 @@ <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> <dependency org="com.vaadin" name="vaadin-shared" - rev="${vaadin.version}" conf="build,test->build" /> + rev="${vaadin.version}" conf="build,test->build" > + <exclude type="pom" conf="test" /> + </dependency> <!-- Required build libs --> <dependency org="org.apache.commons" name="commons-jexl" diff --git a/uitest/ivy.xml b/uitest/ivy.xml index 03b57a30e5..0bd3d26efb 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -35,16 +35,24 @@ <dependency org="com.vaadin" name="vaadin-server" rev="${vaadin.version}" conf="build->build"> <exclude org="javax.servlet"></exclude> + <exclude type="pom" /> </dependency> <dependency org="com.vaadin" name="vaadin-client" - rev="${vaadin.version}" conf="build->build"></dependency> + rev="${vaadin.version}" conf="build->build"> + <exclude type="pom" /> + </dependency> <dependency org="com.vaadin" name="vaadin-client-compiled" - rev="${vaadin.version}" conf="build->build"></dependency> + rev="${vaadin.version}" conf="build->build"> + <exclude type="pom" /> + </dependency> <dependency org="com.vaadin" name="vaadin-themes" - rev="${vaadin.version}" conf="build->build"></dependency> + rev="${vaadin.version}" conf="build->build"> + <exclude type="pom" /> + </dependency> <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}" conf="build->build"> <exclude org="javax.servlet"></exclude> + <exclude type="pom" /> </dependency> <!-- For compiling TestingWidgetSet --> |