avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From th...@apache.org
Subject svn commit: r1186622 - in /avro/trunk: ./ lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/
Date Thu, 20 Oct 2011 06:00:10 GMT
Author: thiru
Date: Thu Oct 20 06:00:09 2011
New Revision: 1186622

URL: http://svn.apache.org/viewvc?rev=1186622&view=rev
Log:
AVRO-936. Avro Java does not build with Maven 2.

Modified:
    avro/trunk/BUILD.txt
    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/ProtocolMojo.java
    avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java

Modified: avro/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/avro/trunk/BUILD.txt?rev=1186622&r1=1186621&r2=1186622&view=diff
==============================================================================
--- avro/trunk/BUILD.txt (original)
+++ avro/trunk/BUILD.txt Thu Oct 20 06:00:09 2011
@@ -4,7 +4,7 @@ REQUIREMENTS
 
 The following packages must be installed before Avro can be built:
 
- - Java: JDK 1.6, protobuf-compile
+ - Java: JDK 1.6, Maven 2 or better, protobuf-compile
  - PHP: php5, phpunit, php5-gmp
  - Python: 2.5 or greater, python-setuptools for dist target
  - C: gcc, autoconf, automake, libtool, asciidoc, source-highlight
@@ -16,7 +16,7 @@ The following packages must be installed
 
 BUILDING
 
-Once the requirements are installed, build.sh can used as follows:
+Once the requirements are installed, build.sh can be used as follows:
 
  './build.sh test' runs tests for all languages
  './build.sh dist' creates all release distribution files in dist/

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1186622&r1=1186621&r2=1186622&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Oct 20 06:00:09 2011
@@ -199,6 +199,7 @@ Avro 1.6.0 (unreleased)
     AVRO-927. Java: Fix Pair#equals() to better compare
     schemas. (Brock Noland via cutting)
 
+    AVRO-936. Avro Java does not build with Maven 2. (thiru)
 Avro 1.5.4 (12 September 2011)
 
   IMPROVEMENTS

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=1186622&r1=1186621&r2=1186622&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
Thu Oct 20 06:00:09 2011
@@ -21,8 +21,6 @@ package org.apache.avro.mojo;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.avro.generic.GenericData.StringType;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
@@ -80,7 +78,7 @@ public abstract class AbstractAvroMojo e
    *
    * @parameter expression="${stringType}"
    */
-  protected StringType stringType = StringType.CharSequence;
+  protected String stringType = "CharSequence";
 
 
   /**

Modified: avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java?rev=1186622&r1=1186621&r2=1186622&view=diff
==============================================================================
--- avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
(original)
+++ avro/trunk/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
Thu Oct 20 06:00:09 2011
@@ -18,6 +18,8 @@
 
 package org.apache.avro.mojo;
 
+import org.apache.avro.generic.GenericData.StringType;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -54,7 +56,7 @@ public class ProtocolMojo extends Abstra
     File src = new File(sourceDirectory, filename);
     Protocol protocol = Protocol.parse(src);
     SpecificCompiler compiler = new SpecificCompiler(protocol);
-    compiler.setStringType(stringType);
+    compiler.setStringType(StringType.valueOf(stringType));
     compiler.compileToDestination(src, outputDirectory);
   }
 

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=1186622&r1=1186621&r2=1186622&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 Thu
Oct 20 06:00:09 2011
@@ -18,6 +18,8 @@
 
 package org.apache.avro.mojo;
 
+import org.apache.avro.generic.GenericData.StringType;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -55,7 +57,7 @@ public class SchemaMojo extends Abstract
     Schema.Parser parser = new Schema.Parser();
     Schema schema = parser.parse(src);
     SpecificCompiler compiler = new SpecificCompiler(schema);
-    compiler.setStringType(stringType);
+    compiler.setStringType(StringType.valueOf(stringType));
     compiler.compileToDestination(src, outputDirectory);
   }
 



Mime
View raw message