From d307f145f3842a8c09408ebf1a543fb7691f8b25 Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Thu, 3 Apr 2014 13:36:13 +0300
Subject: [PATCH] Override elements must be after dependency elements #13532

Change-Id: I8cc1fd86a8ba7ba64595809afbd964e3b384d658
---
 server/ivy.xml | 6 +++---
 themes/ivy.xml | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/ivy.xml b/server/ivy.xml
index 687f7f6dc0..73384313a1 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -47,9 +47,6 @@
                     rev="${vaadin.sass.version}" conf="build,ide,test->default">
             <exclude type="pom" conf="test" />
         </dependency>
-        <!-- remove cssparser override once sass-compiler is updated -->
-        <override org="net.sourceforge.cssparser" module="cssparser"
-                  rev="0.9.11" />
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
@@ -91,6 +88,9 @@
         <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" 
             conf="test,ide->default" /> -->
 
+        <!-- remove cssparser override once sass-compiler is updated -->
+        <override org="net.sourceforge.cssparser" module="cssparser"
+                  rev="0.9.11" />
     </dependencies>
 
 </ivy-module>
diff --git a/themes/ivy.xml b/themes/ivy.xml
index 622314a243..7bc4dfe8da 100644
--- a/themes/ivy.xml
+++ b/themes/ivy.xml
@@ -21,14 +21,15 @@
     <dependencies>
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
             rev="${vaadin.sass.version}" conf="compile-theme->default" />
-        <!-- remove cssparser override once sass-compiler is updated -->
-        <override org="net.sourceforge.cssparser" module="cssparser"
-                  rev="0.9.11" />
 
         <dependency org="com.vaadin" name="vaadin-buildhelpers"
                     rev="${vaadin.version}" conf="compile-theme->build">
             <exclude type="pom" conf="test" />
         </dependency>
+
+        <!-- remove cssparser override once sass-compiler is updated -->
+        <override org="net.sourceforge.cssparser" module="cssparser"
+                  rev="0.9.11" />
     </dependencies>
 
 </ivy-module>
-- 
2.39.5