MAPREDUCE-1556. upgrade to Avro 1.3.0. Contributed by cutting.

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

Author: tomwhite

.eclipse.templates/.classpath

@@ -30,7 +30,7 @@
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-test-0.22.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-hdfs-0.22.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/test/hadoop-hdfs-test-0.22.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.2.0.jar"/>
+	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.3.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.4.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>

CHANGES.txt

@@ -231,6 +231,8 @@ Trunk (unreleased changes)
     MAPREDUCE-1501. FileInputFormat supports multi-level, recursive 
     directory listing.  (Zheng Shao via dhruba)
 
+    MAPREDUCE-1556. upgrade to Avro 1.3.0. (cutting via tomwhite)
+
   BUG FIXES
 
     MAPREDUCE-1258. Fix fair scheduler event log not logging job info.

ivy/hadoop-mapred-template.xml

@@ -30,20 +30,5 @@
       <artifactId>hadoop-core</artifactId>
       <version>0.22.0-dev-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.paranamer</groupId>
-      <artifactId>paranamer</artifactId>
-      <version>1.5</version>
-    </dependency>
   </dependencies>
 </project>

ivy/ivysettings.xml

@@ -43,8 +43,8 @@
         checkmodified="true" changingPattern=".*SNAPSHOT"/>
 
     <filesystem name="fs" m2compatible="true" force="true">
-       <artifact pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].[ext]"/>
-       <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
+       <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+       <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
     </filesystem>
 
     <chain name="default" dual="true" checkmodified="true" changingPattern=".*SNAPSHOT">

ivy/libraries.properties

@@ -20,7 +20,7 @@ ant-task.version=2.0.10
 #Aspectj depedency for Fault injection
 aspectj.version=1.6.5
 
-avro.version=1.2.0
+avro.version=1.3.0
 
 checkstyle.version=4.2
 
@@ -49,8 +49,6 @@ hsqldb.version=1.8.0.10
 #ivy.version=2.0.0-beta2
 ivy.version=2.0.0-rc2
 
-jackson.version=1.0.1
-
 jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
@@ -71,8 +69,6 @@ mockito-all.version=1.8.0
 
 oro.version=2.0.8
 
-paranamer.version=1.5
-
 rats-lib.version=0.6
 
 servlet.version=4.0.6

src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java

@@ -83,7 +83,7 @@ public HistoryEvent getNextEvent() throws IOException {
     Event wrapper;
     try {
       wrapper = (Event)reader.read(null, decoder);
-    } catch (AvroRuntimeException e) {            // at EOF
+    } catch (EOFException e) {            // at EOF
       return null;
     }
     HistoryEvent result;

src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java

@@ -44,16 +44,17 @@ class EventWriter {
   static final String VERSION = "Avro-Json";
 
   private FSDataOutputStream out;
-  private DatumWriter<Object> writer = new SpecificDatumWriter(Event.class);
+  private DatumWriter<Event> writer =
+    new SpecificDatumWriter<Event>(Event.class);
   private Encoder encoder;
 
   EventWriter(FSDataOutputStream out) throws IOException {
     this.out = out;
     out.writeBytes(VERSION);
     out.writeBytes("\n");
-    out.writeBytes(Event._SCHEMA.toString());
+    out.writeBytes(Event.SCHEMA$.toString());
     out.writeBytes("\n");
-    this.encoder = new JsonEncoder(Event._SCHEMA, out);
+    this.encoder = new JsonEncoder(Event.SCHEMA$, out);
   }
 
   synchronized void write(HistoryEvent event) throws IOException { 
@@ -75,10 +76,10 @@ void close() throws IOException {
   }
 
   private static final Schema GROUPS =
-    Schema.createArray(JhCounterGroup._SCHEMA);
+    Schema.createArray(JhCounterGroup.SCHEMA$);
 
   private static final Schema COUNTERS =
-    Schema.createArray(JhCounter._SCHEMA);
+    Schema.createArray(JhCounter.SCHEMA$);
 
   static JhCounters toAvro(Counters counters) {
     return toAvro(counters, "COUNTERS");