pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1606892 - in /pig/trunk: CHANGES.txt build.xml ivy.xml
Date Mon, 30 Jun 2014 19:42:34 GMT
Author: daijy
Date: Mon Jun 30 19:42:33 2014
New Revision: 1606892

URL: http://svn.apache.org/r1606892
Log:
PIG-4044: Pig should use avro-mapred-hadoop2.jar instead of avro-mapred.jar when compile with
hadoop 2

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/build.xml
    pig/trunk/ivy.xml

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1606892&r1=1606891&r2=1606892&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jun 30 19:42:33 2014
@@ -42,6 +42,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4044: Pig should use avro-mapred-hadoop2.jar instead of avro-mapred.jar when compile
with hadoop 2 (daijy)
+
 PIG-4043: JobClient.getMap/ReduceTaskReports() causes OOM for jobs with a large number of
tasks (cheolsoo)
 
 PIG-4036: Fix e2e failures - JobManagement_3, CmdErrors_3 and BigData_4 (daijy)

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1606892&r1=1606891&r2=1606892&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Mon Jun 30 19:42:33 2014
@@ -381,7 +381,7 @@
             <include name="automaton-${automaton.version}.jar"/>
             <include name="jansi-${jansi.version}.jar"/>
             <include name="avro-${avro.version}.jar"/>
-            <include name="avro-mapred-${avro.version}.jar"/>
+            <include name="avro-mapred-${avro.version}*.jar"/>
             <include name="trevni-core-${avro.version}.jar"/>
             <include name="trevni-avro-${avro.version}.jar"/>
             <include name="snappy-java-${snappy.version}.jar"/>
@@ -402,7 +402,7 @@
             <include name="slf4j*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="avro-${avro.version}.jar"/>
-            <include name="avro-mapred-${avro.version}.jar"/>
+            <include name="avro-mapred-${avro.version}*.jar"/>
             <include name="trevni-core-${avro.version}.jar"/>
             <include name="trevni-avro-${avro.version}.jar"/>
             <include name="snappy-java-${snappy.version}.jar"/>

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1606892&r1=1606891&r2=1606892&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Mon Jun 30 19:42:33 2014
@@ -186,7 +186,13 @@
       <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/>
     </dependency>
     <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}"
-      conf="compile->default;checkstyle->master">
+      conf="hadoop20->default;checkstyle->master">
+      <exclude org="org.codehaus.jackson" module="jackson-core-asl"/>
+      <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/>
+    </dependency>
+    <dependency org="org.apache.avro" name="avro-mapred" rev="${avro.version}"
+      conf="hadoop23->default;checkstyle->master">
+      <artifact name="avro-mapred" type="jar" m:classifier="hadoop2"/>
       <exclude org="org.codehaus.jackson" module="jackson-core-asl"/>
       <exclude org="org.codehaus.jackson" module="jackson-mapper-asl"/>
     </dependency>



Mime
View raw message