#38 Documentation updates

sergei-ivanov · Sep 15, 2015 · ca50e1b · ca50e1b
1 parent 27f5cd1
commit ca50e1b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,6 +70,9 @@
         <contributor>
             <name>abatalev</name>
         </contributor>
+        <contributor>
+            <name>Marek Kedzierski (kedzie)</name>
+        </contributor>
     </contributors>
 
     <scm>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -7,6 +7,12 @@
 
     <body>
 
+        <release version="0.4.3" date="Pending" description="Support for JavaNano, minor changes">
+            <action dev="sergei-ivanov" type="add" issue="38" due-to="Marek Kedzierski (kedzie)">
+                Added support for JavaNano generator (requires protobuf compiler version 3 or above).
+            </action>
+        </release>
+
         <release version="0.4.2" date="2015-04-29" description="Bug fixes">
             <action dev="sergei-ivanov" type="fix" issue="34">
                 Made the order of imports predictable and matching the order of dependencies.

diff --git a/src/main/java/com/google/protobuf/maven/ProtocCompileJavaNanoMojo.java b/src/main/java/com/google/protobuf/maven/ProtocCompileJavaNanoMojo.java
@@ -35,7 +35,7 @@ public final class ProtocCompileJavaNanoMojo extends AbstractProtocCompileMojo {
     private File outputDirectory;
 
     /**
-     * Optional comma-separated options to be passed to the JavaNano generator.
+     * Additional comma-separated options to be passed to the JavaNano generator.
      * <b>Cannot</b> contain colon (<tt>:</tt>) symbols.
      */
     @Parameter(

diff --git a/src/main/java/com/google/protobuf/maven/ProtocTestCompileJavaNanoMojo.java b/src/main/java/com/google/protobuf/maven/ProtocTestCompileJavaNanoMojo.java
@@ -35,7 +35,7 @@ public class ProtocTestCompileJavaNanoMojo extends AbstractProtocTestCompileMojo
     private File outputDirectory;
 
     /**
-     * Optional comma-separated options to be passed to the JavaNano generator.
+     * Additional comma-separated options to be passed to the JavaNano generator.
      * <b>Cannot</b> contain colon (<tt>:</tt>) symbols.
      */
     @Parameter(

diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
@@ -31,9 +31,6 @@ Maven Protoc Plugin
   * {{{./compile-cpp-mojo.html}protoc:compile-cpp}}
     compiles main <<<.proto>>> definitions into C++ files and attaches the generated C++ sources to the project.
 
-  * {{{./compile-custom-mojo.html}protoc:compile-custom}}
-    compiles main <<<.proto>>> definitions using a custom <<<protoc>>> plugin.
-
   * {{{./test-compile-cpp-mojo.html}protoc:test-compile-cpp}}
     compiles test <<<.proto>>> definitions into C++ files and attaches the generated C++ test sources to the project.
 
@@ -43,6 +40,17 @@ Maven Protoc Plugin
   * {{{./test-compile-python-mojo.html}protoc:test-compile-python}}
     compiles test <<<.proto>>> definitions into Python files and attaches the generated Python test sources to the project.
 
+  * {{{./compile-javanano-mojo.html}protoc:compile-javanano}}
+    uses JavaNano generator (requires protobuf compiler version 3 or above) to
+    compile main <<<.proto>>> definitions into Java files and attaches the generated Java sources to the project.
+
+  * {{{./test-compile-javanano-mojo.html}protoc:test-compile-javanano}}
+    uses JavaNano generator (requires protobuf compiler version 3 or above) to
+    compile test <<<.proto>>> definitions into Java files and attaches the generated Java test sources to the project.
+
+  * {{{./compile-custom-mojo.html}protoc:compile-custom}}
+    compiles main <<<.proto>>> definitions using a custom <<<protoc>>> plugin.
+
   * {{{./test-compile-custom-mojo.html}protoc:test-compile-custom}}
     compiles test <<<.proto>>> definitions using a custom <<<protoc>>> plugin.