zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1528224 - in /zookeeper/trunk: CHANGES.txt ivy.xml
Date Tue, 01 Oct 2013 21:42:24 GMT
Author: phunt
Date: Tue Oct  1 21:42:24 2013
New Revision: 1528224

URL: http://svn.apache.org/r1528224
Log:
ZOOKEEPER-1655. Make jline dependency optional in maven pom (Thomas Weise 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=1528224&r1=1528223&r2=1528224&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Oct  1 21:42:24 2013
@@ -397,6 +397,9 @@ BUGFIXES:
 
   ZOOKEEPER-1718. Support JLine 2 (Manikumar Reddy via phunt)
 
+  ZOOKEEPER-1655. Make jline dependency optional in maven pom
+  (Thomas Weise via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1528224&r1=1528223&r2=1528224&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Tue Oct  1 21:42:24 2013
@@ -27,8 +27,9 @@
 
   <configurations defaultconfmapping="default">
     <conf name="master"/>
-    <conf name="default"/>
+    <conf name="default" extends="optional"/>
     <conf name="test"/>
+    <conf name="optional"/> <!-- optional in generated pom -->
     <conf name="package" extends="master"/>
     <conf name="jdiff" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for
releaseaudit target"/>
@@ -45,7 +46,7 @@
   
     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
     <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
-    <dependency org="jline" name="jline" rev="2.11" transitive="false" conf="default"/>
+    <dependency org="jline" name="jline" rev="2.11" transitive="false" conf="optional->default"/>
 
     <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.5.Final">
       <artifact name="netty" type="jar" conf="default"/>



Mime
View raw message