Fixed pom fails in unit tests.

Change-Id: I0acbde16576dc26c36031038fe905695581c682d

diff --git a/client/ivy.xml b/client/ivy.xml
index ccc304be3dbe653b65bb6b6d9632ec3e70fb3eaa..3abdcf9ba5258ff5e94377aae3a28793d217aab7 100644 (file)
--- 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 2967d25f326672e8b0fe3622ce97dd1162de67f6..638cc299d0df1b7f7b2dfc6d0be3f26a95621a2f 100644 (file)
--- 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 0f8496650861ae507a9186630f8719cb8948ba1b..ccd00a29d9ac9693831fd7a1b0d25b638a1b8ca7 100644 (file)
--- 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 03b57a30e5d6407c4715636f368a93d5dd829835..0bd3d26efb4e8984d04373cf177acfae2cde17b7 100644 (file)
--- 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 -->