svn commit: r1407424 - in /avro/trunk: CHANGES.txt lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java

[tomwhite]

Author: tomwhite
Date: Fri Nov  9 11:25:30 2012
New Revision: 1407424

URL: http://svn.apache.org/viewvc?rev=1407424&view=rev
Log:
Reverting AVRO-983 since it broke the build.

Modified:
    avro/trunk/CHANGES.txt
    
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java
    
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java

Modified: avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1407424&r1=1407423&r2=1407424&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Fri Nov  9 11:25:30 2012
@@ -20,9 +20,6 @@ Trunk (not yet released)
     AVRO-1169. Java: Reduce memory footprint of resolver.
     (Hernan Otero via cutting)
 
-    AVRO-983. maven-avro-plugin: Allow maven schema compiler to support
-    external reference in an another avro schema file. (tomwhite)
-
   BUG FIXES
 
     AVRO-1171. Java: Don't call configure() twice on mappers & reducers.

Modified: 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java?rev=1407424&r1=1407423&r2=1407424&view=diff
==============================================================================
--- 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java
 (original)
+++ 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/AbstractAvroMojo.java
 Fri Nov  9 11:25:30 2012
@@ -20,7 +20,6 @@ package org.apache.avro.mojo;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -137,9 +136,7 @@ public abstract class AbstractAvroMojo e
     for (String exclude : excludes) {
       fs.addExclude(exclude);
     }
-    String[] files = fileSetManager.getIncludedFiles(fs);
-    Arrays.sort(files);
-    return files;
+    return fileSetManager.getIncludedFiles(fs);
   }
 
   private void compileFiles(String[] files, File sourceDir, File outDir) 
throws MojoExecutionException {

Modified: 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java?rev=1407424&r1=1407423&r2=1407424&view=diff
==============================================================================
--- 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
 (original)
+++ 
avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
 Fri Nov  9 11:25:30 2012
@@ -51,11 +51,10 @@ public class SchemaMojo extends Abstract
    */
   private String[] testIncludes = new String[] { "**/*.avsc" };
 
-  private Schema.Parser parser = new Schema.Parser();
-
   @Override
   protected void doCompile(String filename, File sourceDirectory, File 
outputDirectory) throws IOException {
     File src = new File(sourceDirectory, filename);
+    Schema.Parser parser = new Schema.Parser();
     Schema schema = parser.parse(src);
     SpecificCompiler compiler = new SpecificCompiler(schema);
     compiler.setTemplateDir(templateDirectory);