You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/09/23 23:01:56 UTC
svn commit: r818259 - in /maven/plugins/branches/maven-site-plugin-3.x/src:
it/full-reporting/pom.xml
main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Author: olamy
Date: Wed Sep 23 21:01:56 2009
New Revision: 818259
URL: http://svn.apache.org/viewvc?rev=818259&view=rev
Log:
canGenerateReport() must be called after lifecycle (cobertura report check if a file generated by the forking exists).
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=818259&r1=818258&r2=818259&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Wed Sep 23 21:01:56 2009
@@ -33,7 +33,6 @@
<version>@project.version@</version>
</plugin>
<plugin>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadocPluginVersion}</version>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=818259&r1=818258&r2=818259&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Wed Sep 23 21:01:56 2009
@@ -92,21 +92,27 @@
for ( ReportPlugin reportPlugin : mavenReportExecutorRequest.getProject().getReporting().getPlugins() )
{
+
Plugin plugin = new Plugin();
plugin.setGroupId( reportPlugin.getGroupId() );
plugin.setArtifactId( reportPlugin.getArtifactId() );
plugin.setVersion( reportPlugin.getVersion() );
+ if (logger.isInfoEnabled())
+ {
+ logger.info( "configuring reportPlugin " + plugin.getGroupId() + ":" + plugin.getArtifactId() + ":" + plugin.getVersion() );
+ }
+
List<String> goals = new ArrayList<String>();
PluginDescriptor pluginDescriptor = mavenPluginManager.getPluginDescriptor( plugin, repositoryRequest );
-
- if ( reportPlugin.getReportSets().isEmpty() )
+ /*
+ if ( )
{
continue;
- }
+ }*/
- if ( reportPlugin.getReportSets() == null )
+ if ( reportPlugin.getReportSets().isEmpty() )
{
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
for ( MojoDescriptor mojoDescriptor : mojoDescriptors )
@@ -142,18 +148,19 @@
getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
if ( mavenReport != null )
{
- if ( canGenerateReport( mavenReport ) )
- {
+
MavenReportExecution mavenReportExecution =
new MavenReportExecution( mavenReport, pluginDescriptor.getClassRealm() );
- lifecycleExecutor.calculateForkedExecutions( mojoExecution,
- mavenReportExecutorRequest.getMavenSession() );
- if ( !mojoExecution.getForkedExecutions().isEmpty() )
- {
- lifecycleExecutor.executeForkedExecutions( mojoExecution,
- mavenReportExecutorRequest.getMavenSession() );
- }
+ lifecycleExecutor.calculateForkedExecutions( mojoExecution,
+ mavenReportExecutorRequest.getMavenSession() );
+ if ( !mojoExecution.getForkedExecutions().isEmpty() )
+ {
+ lifecycleExecutor.executeForkedExecutions( mojoExecution,
+ mavenReportExecutorRequest.getMavenSession() );
+ }
+ if ( canGenerateReport( mavenReport ) )
+ {
reports.add( mavenReportExecution );
}
}