You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2014/02/24 03:10:23 UTC

svn commit: r1571127 - in /pig/trunk: CHANGES.txt ivy.xml ivy/libraries.properties

Author: cheolsoo
Date: Mon Feb 24 02:10:22 2014
New Revision: 1571127

URL: http://svn.apache.org/r1571127
Log:
PIG-3776: Conflicting versions of jline is present in trunk (cheolsoo)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/ivy.xml
    pig/trunk/ivy/libraries.properties

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1571127&r1=1571126&r2=1571127&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Feb 24 02:10:22 2014
@@ -89,6 +89,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-3776: Conflicting versions of jline is present in trunk (cheolsoo)
+
 PIG-3674: Fix TestAccumuloPigCluster on Hadoop 2 (elserj via daijy)
 
 PIG-3740: Document direct fetch optimization (lbendig via cheolsoo)

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1571127&r1=1571126&r2=1571127&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Mon Feb 24 02:10:22 2014
@@ -367,6 +367,7 @@
       <exclude org="commons-io" module="commons-io"/>
       <exclude org="commons-lang" module="commons-lang"/>
       <exclude org="commons-logging" module="commons-logging"/>
+      <exclude org="jline" module="jline"/>
       <exclude org="log4j" module="log4j"/>
       <exclude org="org.apache.hadoop" module="hadoop-client"/>
       <exclude org="org.apache.zookeeper" module="zookeeper"/>
@@ -383,6 +384,7 @@
       <exclude org="commons-io" module="commons-io"/>
       <exclude org="commons-lang" module="commons-lang"/>
       <exclude org="commons-logging" module="commons-logging"/>
+      <exclude org="jline" module="jline"/>
       <exclude org="log4j" module="log4j"/>
       <exclude org="org.apache.hadoop" module="hadoop-client"/>
       <exclude org="org.apache.zookeeper" module="zookeeper"/>

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1571127&r1=1571126&r2=1571127&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Mon Feb 24 02:10:22 2014
@@ -57,7 +57,7 @@ jdeb.version=0.8
 jdiff.version=1.0.9
 jetty.version=6.1.26
 jetty-util.version=6.1.26
-jline.version=0.9.94
+jline.version=1.0
 joda-time.version=2.1
 jopt.version=4.1
 json-simple.version=1.1