You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2012/09/15 02:40:10 UTC

svn commit: r1384988 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Author: bimargulies
Date: Sat Sep 15 00:40:09 2012
New Revision: 1384988

URL: http://svn.apache.org/viewvc?rev=1384988&view=rev
Log:
MJAVADOC-349: additionalJOption only supports one additional option


Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1384988&r1=1384987&r2=1384988&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sat Sep 15 00:40:09 2012
@@ -358,6 +358,19 @@ public abstract class AbstractJavadocMoj
     private String additionalJOption;
 
     /**
+     * Set additional JVM options for the execution of the javadoc command via the '-J' option to javadoc.
+     * Example:
+     * <pre>
+     *     &lt;additionalJOptions&gt;
+     *         &lt;additionalJOption&gt;-J-Xmx1g &lt;/additionalJOption&gt;
+     *     &lt;/additionalJOptions&gt;
+     * </pre>
+     * @since 2.9
+     */
+    @Parameter
+    private String[] additionalJOptions;
+
+    /**
      * A list of artifacts containing resources which should be copied into the
      * Javadoc output directory (like stylesheets, icons, etc.).
      * <br/>
@@ -1890,6 +1903,14 @@ public abstract class AbstractJavadocMoj
             cmd.createArg().setValue( additionalJOption );
         }
 
+        if ( additionalJOptions != null && additionalJOptions.length != 0 )
+        {
+            for ( String jo : additionalJOptions )
+            {
+                cmd.createArg().setValue( jo );
+            }
+        }
+
         List<String> arguments = new ArrayList<String>();
 
         // ----------------------------------------------------------------------