zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1611729 - in /zookeeper/trunk: CHANGES.txt ivy.xml
Date Fri, 18 Jul 2014 17:28:32 GMT
Author: phunt
Date: Fri Jul 18 17:28:31 2014
New Revision: 1611729

URL: http://svn.apache.org/r1611729
Log:
ZOOKEEPER-1968. Make Jetty dependencies optional in ivy.xml (Bill Havanki via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/ivy.xml

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1611729&r1=1611728&r2=1611729&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Jul 18 17:28:31 2014
@@ -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 - 

Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1611729&r1=1611728&r2=1611729&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Fri Jul 18 17:28:31 2014
@@ -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>



Mime
View raw message