You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/05/29 20:23:31 UTC
svn commit: r661429 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc:
AbstractJavadocMojo.java JavadocJar.java JavadocReport.java
Author: vsiveton
Date: Thu May 29 11:23:30 2008
New Revision: 661429
URL: http://svn.apache.org/viewvc?rev=661429&view=rev
Log:
MJAVADOC-189: Allow skipping of javadoc generation
Submitted by: Francois Fernandes
Reviewed by: Vincent Siveton
o patch applied with small changes
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.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=661429&r1=661428&r2=661429&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 Thu May 29 11:23:30 2008
@@ -287,6 +287,13 @@
private float fJavadocVersion = 0.0f;
+ /**
+ * Specifies whether the javadoc generation should be skipped
+ *
+ * @parameter expression="${maven.javadoc.skip}" default-value="false"
+ */
+ protected boolean skip;
+
// ----------------------------------------------------------------------
// Javadoc Options
// ----------------------------------------------------------------------
@@ -1156,6 +1163,12 @@
protected void executeReport( Locale locale )
throws MavenReportException
{
+ if ( skip )
+ {
+ getLog().info( "Skipping javadoc generation" );
+ return;
+ }
+
if ( aggregate && !project.isExecutionRoot() )
{
return;
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java?rev=661429&r1=661428&r2=661429&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocJar.java Thu May 29 11:23:30 2008
@@ -128,6 +128,12 @@
public void execute()
throws MojoExecutionException
{
+ if ( skip )
+ {
+ getLog().info( "Skipping javadoc generation" );
+ return;
+ }
+
File destDir = this.destDir;
if ( destDir == null )
{
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=661429&r1=661428&r2=661429&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java Thu May 29 11:23:30 2008
@@ -208,6 +208,12 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ if ( skip )
+ {
+ getLog().info( "Skipping javadoc generation" );
+ return;
+ }
+
try
{
RenderingContext context = new RenderingContext( outputDirectory, getOutputName() + ".html" );