From 49609bb9caeb732eaf03f10abc2efc887a9fbab6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 14 Sep 2012 11:59:04 +0300
Subject: [PATCH] Ensure dependencies are not 'optional' in pom.xml (#9604)

---
 theme-compiler/ivy.xml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 9e6b39b3ad..17ea1952a9 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -24,20 +24,31 @@
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
             rev="${vaadin.version}" conf="build,tests" />
-		<dependency org="org.apache.commons" name="commons-jexl" rev="2.1.1" />
 
-        <dependency org="org.w3c.css" name="sac" rev="1.3" />
-        <dependency org="milyn" name="flute" rev="1.3" conf="*->default" />
+        <!-- Required build libs -->
+        <dependency org="org.apache.commons" name="commons-jexl"
+            rev="2.1.1" conf="build,ide->default" />
+        <dependency org="org.w3c.css" name="sac" rev="1.3"
+            conf="build,ide->default" />
+        <dependency org="milyn" name="flute" rev="1.3"
+            conf="build,ide->default" />
+        <dependency org="net.sourceforge.cssparser" name="cssparser"
+            rev="0.9.5" conf="build,ide->default" />
+        <dependency org="commons-cli" name="commons-cli" rev="1.2"
+            conf="build,ide->default" />
+
+        <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" />
-        <dependency org="com.carrotsearch" name="smartsprites"
-            rev="0.2.3-itmill" />
+            rev="2.5" conf="build-provided->default" />
+
+        <!-- Testing libs -->
         <dependency org="junit" name="junit" rev="4.5"
             conf="tests -> default" />
-        <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.5" conf="tests,ide->default" />
-        <dependency org="commons-cli" name="commons-cli" rev="1.2"
-            conf="build,ide -> default" />
+
+        <!-- Internally used, for now -->
+        <dependency org="com.carrotsearch" name="smartsprites"
+            rev="0.2.3-itmill" />
+
     </dependencies>
 
 </ivy-module>
-- 
2.39.5