ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml (Bill Hav…

…anki via phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1611729 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 18, 2014 · a622a26 · a622a26
1 parent 8d64dbf
commit a622a26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -987,6 +987,9 @@ IMPROVEMENTS:
   Visual Studio editions (VS 2012/2013)- 32-bit and 64-bit.
   (Orion Hodson via fpj)
 
+  ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml
+  (Bill Havanki via phunt)
+
 headers
 
 Release 3.4.0 - 

diff --git a/ivy.xml b/ivy.xml
@@ -77,7 +77,9 @@
 
     <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
 
-    <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26" />
-    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.11" />
+    <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.26"
+                conf="optional->default"/>
+    <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.11"
+                conf="optional->default"/>
   </dependencies>
 </ivy-module>