diff options
| -rw-r--r-- | client-compiler/ivy.xml | 5 | ||||
| -rw-r--r-- | server/ivy.xml | 3 | ||||
| -rw-r--r-- | themes/ivy.xml | 3 |
3 files changed, 10 insertions, 1 deletions
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"> |