MAPREDUCE-2868. ant build broken in hadoop-mapreduce dir (mahadev, giri and arun via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1160456 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce/CHANGES.txt

@@ -1125,6 +1125,8 @@ Trunk (unreleased changes)
     MAPREDUCE-2867. Remove Unused TestApplicaitonCleanup in resourcemanager/applicationsmanager.
     (mahadev)
 
+    MAPREDUCE-2868. ant build broken in hadoop-mapreduce dir (mahadev, giri and arun via mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce/build.xml

@@ -371,7 +371,7 @@
 
   <target name="avro-generate" depends="init">
     <mkdir dir="${build.src}/org/apache/hadoop/mapreduce/jobhistory"/>
-    <taskdef name="protocol" classname="org.apache.avro.specific.ProtocolTask">
+    <taskdef name="protocol" classname="org.apache.avro.compiler.specific.ProtocolTask">
       <classpath refid="classpath" />
     </taskdef>
     <protocol destdir="${build.src}">

hadoop-mapreduce/hadoop-mr-client/hadoop-mapreduce-client-core/pom.xml

@@ -31,7 +31,7 @@
       <plugin>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-maven-plugin</artifactId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
         <executions>
           <execution>
             <phase>generate-sources</phase>

hadoop-mapreduce/hadoop-mr-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java

@@ -32,6 +32,7 @@ import org.apache.hadoop.mapreduce.Counters;
 
 import org.apache.avro.Schema;
 import org.apache.avro.io.Decoder;
+import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.JsonDecoder;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.specific.SpecificDatumReader;
@@ -71,7 +72,7 @@ public class EventReader implements Closeable {
     
     this.schema = Schema.parse(in.readLine());
     this.reader = new SpecificDatumReader(schema);
-    this.decoder = new JsonDecoder(schema, in);
+    this.decoder = DecoderFactory.get().jsonDecoder(schema, in);
   }
   
   /**

hadoop-mapreduce/hadoop-mr-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import org.apache.avro.Schema;
 import org.apache.avro.io.DatumWriter;
 import org.apache.avro.io.Encoder;
+import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.io.JsonEncoder;
 import org.apache.avro.specific.SpecificDatumWriter;
 import org.apache.avro.util.Utf8;
@@ -56,7 +57,7 @@ class EventWriter {
     out.writeBytes("\n");
     out.writeBytes(Event.SCHEMA$.toString());
     out.writeBytes("\n");
-    this.encoder = new JsonEncoder(Event.SCHEMA$, out);
+    this.encoder =  EncoderFactory.get().jsonEncoder(Event.SCHEMA$, out);
   }
   
   synchronized void write(HistoryEvent event) throws IOException { 

hadoop-mapreduce/hadoop-mr-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithHistoryService.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import junit.framework.Assert;
 
-import org.apache.avro.ipc.AvroRemoteException;
+import org.apache.avro.AvroRemoteException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.FailingMapper;

hadoop-mapreduce/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/ipc/AvroYarnRPC.java

@@ -24,8 +24,8 @@ import java.net.InetSocketAddress;
 import org.apache.avro.ipc.Server;
 import org.apache.avro.ipc.SocketServer;
 import org.apache.avro.ipc.SocketTransceiver;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.token.SecretManager;
 import org.apache.hadoop.security.token.TokenIdentifier;

hadoop-mapreduce/hadoop-yarn/pom.xml

@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.2</version>
       <exclusions>
         <exclusion>
           <groupId>org.mortbay.jetty</groupId>

hadoop-mapreduce/ivy.xml

@@ -116,6 +116,12 @@
 
    <dependency org="org.apache.lucene" name="lucene-core" 
                rev="${lucene-core.version}" conf="javadoc->default"/>
+   <dependency org="org.apache.avro" name="avro-compiler" rev="${avro.version}" 
+               conf="compile->master">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
    <dependency org="org.apache.avro" name="avro" rev="${avro.version}" 
                conf="compile->default">
       <exclude module="ant"/>

hadoop-mapreduce/ivy/libraries.properties

@@ -20,8 +20,8 @@ ant-task.version=2.0.10
 #This property has to be updated synchronously with aop.xml
 aspectj.version=1.6.5
 
-avro.version=1.4.1
-
+avro.version=1.5.2
+paranamer.version=2.2
 checkstyle.version=4.2
 
 commons-cli.version=1.2

hadoop-mapreduce/pom.xml

@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.2</version>
       <exclusions>
         <exclusion>
           <groupId>org.mortbay.jetty</groupId>