svn commit: r1479140 - /maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

[rfscholte]

Author: rfscholte
Date: Sat May  4 17:02:34 2013
New Revision: 1479140

URL: http://svn.apache.org/r1479140
Log:
[MPDF-48] make PDF plugin run reports when used with Maven 3 
Pass pluginArtifact instead of mojoDescriptor to validate generated report

Modified:
    
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java

Modified: 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java?rev=1479140&r1=1479139&r2=1479140&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-pdf-plugin/src/main/java/org/apache/maven/plugins/pdf/PdfMojo.java
 Sat May  4 17:02:34 2013
@@ -1287,7 +1287,7 @@ public class PdfMojo
 
         writeGeneratedReport( sw.toString(), generatedReport );
 
-        if ( isValidGeneratedReport( mojoDescriptor, generatedReport, 
localReportName ) )
+        if ( isValidGeneratedReport( 
mojoDescriptor.getPluginDescriptor().getPluginArtifact(), generatedReport, 
localReportName ) )
         {
             getGeneratedMavenReports( locale ).add( report );
         }
@@ -1464,7 +1464,7 @@ public class PdfMojo
      * @return <code>true</code> if Doxia is able to parse the generated 
report, <code>false</code> otherwise.
      * @since 1.1
      */
-    private boolean isValidGeneratedReport( MojoDescriptor mojoDescriptor, 
File generatedReport,
+    private boolean isValidGeneratedReport( Artifact pluginArtifact, File 
generatedReport,
                                             String localReportName )
     {
         SinkAdapter sinkAdapter = new SinkAdapter();
@@ -1488,16 +1488,16 @@ public class PdfMojo
             sb.append( "You could:" ).append( EOL );
             sb.append( "  * exclude all reports using -DincludeReports=false" 
).append( EOL );
             sb.append( "  * remove the " );
-            sb.append( mojoDescriptor.getPluginDescriptor().getGroupId() );
+            sb.append( pluginArtifact.getGroupId() );
             sb.append( ":" );
-            sb.append( mojoDescriptor.getPluginDescriptor().getArtifactId() );
+            sb.append( pluginArtifact.getArtifactId() );
             sb.append( ":" );
-            sb.append( mojoDescriptor.getPluginDescriptor().getVersion() );
+            sb.append( pluginArtifact.getVersion() );
             sb.append( " from the <reporting/> part. To not affect the site 
generation, " );
             sb.append( "you could create a PDF profile." ).append( EOL );
             sb.append( EOL );
 
-            MavenProject pluginProject = getReportPluginProject( 
mojoDescriptor.getPluginDescriptor().getPluginArtifact() );
+            MavenProject pluginProject = getReportPluginProject( 
pluginArtifact );
 
             if ( pluginProject == null )
             {