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 bc50e2a93e9d942f04f68c5d01787c3b5d62924a..8c455972149eb7f73b2806c18e43285658de4e9c 100644 (file)
--- 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 1b1b49d78ce84d501c5dfd79ab6af65830700f58..687f7f6dc03a7d181801042c23a636196dc1e98a 100644 (file)
--- 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 f4cc507041b1489917e2fc7c492cb83a7c8e17e8..622314a243e7c3d8185169912f790dfaa8dfb5cb 100644 (file)
--- 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">