Browse Source

Override elements must be after dependency elements #13532

Change-Id: I8cc1fd86a8ba7ba64595809afbd964e3b384d658
tags/7.2.0.beta1
Jonatan Kronqvist 10 years ago
parent
commit
d307f145f3
2 changed files with 7 additions and 6 deletions
  1. 3
    3
      server/ivy.xml
  2. 4
    3
      themes/ivy.xml

+ 3
- 3
server/ivy.xml View File

@@ -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>

+ 4
- 3
themes/ivy.xml View File

@@ -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>

Loading…
Cancel
Save