diff --git a/pom.xml b/pom.xml
index 5b0457b4..c9f40a3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,9 @@
abatalev
+
+ Marek Kedzierski (kedzie)
+
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e527a134..6768795c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,6 +7,12 @@
+
+
+ Added support for JavaNano generator (requires protobuf compiler version 3 or above).
+
+
+
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
index 0c04a92c..558c85cc 100644
--- 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.
* Cannot contain colon (:) symbols.
*/
@Parameter(
diff --git a/src/main/java/com/google/protobuf/maven/ProtocTestCompileJavaNanoMojo.java b/src/main/java/com/google/protobuf/maven/ProtocTestCompileJavaNanoMojo.java
index 9afea78d..a9782d5a 100644
--- 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.
* Cannot contain colon (:) symbols.
*/
@Parameter(
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 933ec210..10d35744 100644
--- 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 <<>> 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 <<>> plugin.
+
* {{{./test-compile-custom-mojo.html}protoc:test-compile-custom}}
compiles test <<<.proto>>> definitions using a custom <<>> plugin.