Preparation for the release, documentation update

sergei-ivanov · Dec 21, 2015 · 3653b8e · 3653b8e
1 parent 485cafd
commit 3653b8e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,9 @@
         <contributor>
             <name>Marek Kedzierski (kedzie)</name>
         </contributor>
+        <contributor>
+            <name>Alexander Torstling (atorstling)</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.4" date="2015-12-21" description="Additional protoc options">
+            <action dev="sergei-ivanov" type="add" issue="39" due-to="Alexander Torstling (atorstling)">
+                Added support for including source info in descriptor sets.
+            </action>
+        </release>
+
         <release version="0.4.3" date="2015-09-20" 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).

diff --git a/src/main/java/com/google/protobuf/maven/AbstractProtocMojo.java b/src/main/java/com/google/protobuf/maven/AbstractProtocMojo.java
@@ -324,6 +324,7 @@ abstract class AbstractProtocMojo extends AbstractMojo {
      * If {@code true} and {@code writeDescriptorSet} has been set, do not strip SourceCodeInfo 
      * from the FileDescriptorProto. This results in vastly larger descriptors that include information 
      * about the original location of each decl in the source file as well as surrounding comments.
+     *
      * @since 0.4.4
      */
     @Parameter(

diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
@@ -202,6 +202,10 @@ mvn toolchains:toolchain protoc:test-compile
   * <<<includeDependenciesInDescriptorSet>>> - if <<<true>>>, all imports are included in the descriptor set; default
     is <<<false>>>.
 
+  * <<<includeSourceInfoInDescriptorSet>>> - if <<<true>>>, source code information will be included in the
+    descriptor set; default is <<<false>>>. Please note that the size of the description set may increase significantly
+    if this option is enabled.
+
   * <<<descriptorSetFileName>>> - the file name of the descriptor set; default is the artifact name with
     the <<<.protobin>>> extension.