Author: cutting
Date: Fri Apr 29 22:09:50 2011
New Revision: 1097970
URL: http://svn.apache.org/viewvc?rev=1097970&view=rev
Log:
Merge change 1097968 from trunk to 1.5 branch. Fixes: AVRO-812.
Modified:
avro/branches/branch-1.5/ (props changed)
avro/branches/branch-1.5/CHANGES.txt
avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 29 22:09:50 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792,1089128,1089131,1089550,1094812,1095206-1095208,1095493,1095529,1095548,1095550,1096798,1097916,1097927,1097968
Modified: avro/branches/branch-1.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/CHANGES.txt?rev=1097970&r1=1097969&r2=1097970&view=diff
==============================================================================
--- avro/branches/branch-1.5/CHANGES.txt (original)
+++ avro/branches/branch-1.5/CHANGES.txt Fri Apr 29 22:09:50 2011
@@ -55,6 +55,9 @@ Avro 1.5.1 (unreleased)
AVRO-791. Java: Add avro-tools-nodeps jar. Also change 'mvn
install' to not GPG sign things by default. (scottcarey via cutting)
+ AVRO-812. Java: Implement help goal for Maven plugin.
+ (Holger Hoffstätte via cutting)
+
BUG FIXES
AVRO-786. Java: Fix equals() to work on objects containing maps. (cutting)
Modified: avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml?rev=1097970&r1=1097969&r2=1097970&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml (original)
+++ avro/branches/branch-1.5/lang/java/maven-plugin/pom.xml Fri Apr 29 22:09:50
2011
@@ -27,7 +27,7 @@
</parent>
<artifactId>avro-maven-plugin</artifactId>
<name>Apache Avro Maven Plugin</name>
- <description>Maven plulgin for Avro IDL and Specific API
Compilers</description>
+ <description>Maven plugin for Avro IDL and Specific API
Compilers</description>
<packaging>maven-plugin</packaging>
<properties>
@@ -39,6 +39,21 @@
</prerequisites>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.7</version>
+ <executions>
+ <execution>
+ <id>generated-helpmojo</id>
+ <goals>
+ <goal>helpmojo</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencies>
Modified:
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java?rev=1097970&r1=1097969&r2=1097970&view=diff
==============================================================================
---
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
(original)
+++
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/IDLProtocolMojo.java
Fri Apr 29 22:09:50 2011
@@ -27,7 +27,7 @@ import org.apache.avro.compiler.idl.Pars
import org.apache.avro.compiler.specific.SpecificCompiler;
/**
- * Compile an Avro schema file.
+ * Generate Java classes and interfaces from AvroIDL files (.avdl)
*
* @goal idl-protocol
* @phase generate-sources
Modified:
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java?rev=1097970&r1=1097969&r2=1097970&view=diff
==============================================================================
---
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
(original)
+++
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/ProtocolMojo.java
Fri Apr 29 22:09:50 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.avro.compiler.specific.SpecificCompiler;
/**
- * Compile an Avro protocol schema file.
+ * Generate Java classes and interfaces from Avro protocol files (.avpr)
*
* @goal protocol
* @phase generate-sources
Modified:
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
URL:
http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java?rev=1097970&r1=1097969&r2=1097970&view=diff
==============================================================================
---
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
(original)
+++
avro/branches/branch-1.5/lang/java/maven-plugin/src/main/java/org/apache/avro/mojo/SchemaMojo.java
Fri Apr 29 22:09:50 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.avro.compiler.specific.SpecificCompiler;
/**
- * Compile an Avro schema file.
+ * Generate Java classes from Avro schema files (.avsc)
*
* @goal schema
* @phase generate-sources
