From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Thu, 3 Apr 2014 08:15:40 +0000 (+0300)
Subject: Override the cssparser dependency from sass-compiler (#13532)
X-Git-Tag: 7.2.0.beta1~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3efe81da8ba99d527a3caa210251aa0cd28f2f61;p=vaadin-framework.git

Override the cssparser dependency from sass-compiler (#13532)

vaadin-sass-compiler depends on an older version of cssparser than the
one used in client-compiler. This change overrides all sass-compiler
provided cssparser deps with the newer version.

Change-Id: I06d2b957d66dd3abbef161ae2643eec0cdf7e13a
---

diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index bc50e2a93e..8c45597214 100644
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -26,7 +26,10 @@
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build" />
         <dependency org="com.vaadin" name="vaadin-sass-compiler"
-            rev="${vaadin.sass.version}" conf="build,ide->default" />
+            rev="${vaadin.sass.version}" conf="build,ide->default">
+            <!-- remove cssparser override once sass-compiler is updated -->
+            <exclude name="cssparser" />
+        </dependency>
 
         <dependency org="commons-collections" name="commons-collections"
             rev="3.1" conf="build,ide -> default" />
diff --git a/server/ivy.xml b/server/ivy.xml
index 1b1b49d78c..687f7f6dc0 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -47,6 +47,9 @@
                     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 -->
diff --git a/themes/ivy.xml b/themes/ivy.xml
index f4cc507041..622314a243 100644
--- a/themes/ivy.xml
+++ b/themes/ivy.xml
@@ -21,6 +21,9 @@
     <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">