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

[da...@apache.org]

Author: daijy
Date: Thu Mar 26 19:08:46 2015
New Revision: 1669411

URL: http://svn.apache.org/r1669411
Log:
PIG-4484: Ant pull jetty-6.1.26.zip on some platform

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=1669411&r1=1669410&r2=1669411&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Mar 26 19:08:46 2015
@@ -58,6 +58,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4484: Ant pull jetty-6.1.26.zip on some platform (daijy)
+
 PIG-4479: Pig script with union within nested splits followed by join failed on Tez (rohini)
 
 PIG-4457: Error is thrown by JobStats.getOutputSize() when storing to a MySql table (rohini)

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1669411&r1=1669410&r2=1669411&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Thu Mar 26 19:08:46 2015
@@ -87,12 +87,8 @@
       conf="hadoop23->master"/>
     <dependency org="javax.ws.rs" name="jsr311-api" rev="${jsr311-api.version}"
       conf="hadoop23->master"/>
-    <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}"
-      conf="hadoop23->master"/>
     <dependency org="com.google.protobuf" name="protobuf-java" rev="${protobuf-java.version}"
       conf="hadoop23->master"/>
-    <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}"
-      conf="hadoop23->master"/>
     <dependency org="javax.inject" name="javax.inject" rev="${javax-inject.version}"
       conf="hadoop23->master"/>
     <dependency org="javax.xml.bind" name="jaxb-api" rev="${jaxb-api.version}"
@@ -171,8 +167,10 @@
     <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-hs" 
       rev="${hadoop-mapreduce.version}" conf="hadoop23->master"/>
     <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}"
-      conf="compile->master"/>
-    <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty-util.version}"
+      conf="compile->master">
+      <artifact name="jetty" ext="jar" />
+    </dependency>
+    <dependency org="org.mortbay.jetty" name="jetty-util" rev="${jetty.version}"
       conf="compile->master"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
       conf="compile->master;checkstyle->master"/>

Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1669411&r1=1669410&r2=1669411&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Thu Mar 26 19:08:46 2015
@@ -59,7 +59,6 @@ jdeb.version=0.8
 jdiff.version=1.0.9
 jettison.version=1.3.4
 jetty.version=6.1.26
-jetty-util.version=6.1.26
 jline.version=1.0
 joda-time.version=2.5
 jopt.version=4.1