Browse Source

ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml (Bill Havanki via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1611729 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 11 years ago
parent
commit
25ea38a87b
2 changed files with 7 additions and 2 deletions
  1. 3 0
      CHANGES.txt
  2. 4 2
      ivy.xml

+ 3 - 0
CHANGES.txt

@@ -987,6 +987,9 @@ IMPROVEMENTS:
   Visual Studio editions (VS 2012/2013)- 32-bit and 64-bit.
   Visual Studio editions (VS 2012/2013)- 32-bit and 64-bit.
   (Orion Hodson via fpj)
   (Orion Hodson via fpj)
 
 
+  ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml
+  (Bill Havanki via phunt)
+
 headers
 headers
 
 
 Release 3.4.0 - 
 Release 3.4.0 - 

+ 4 - 2
ivy.xml

@@ -77,7 +77,9 @@
 
 
     <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
     <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>
   </dependencies>
 </ivy-module>
 </ivy-module>