You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/04/07 09:49:59 UTC
svn commit: r1465338 -
/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Author: hboutemy
Date: Sun Apr 7 07:49:58 2013
New Revision: 1465338
URL: http://svn.apache.org/r1465338
Log:
optimization: don't calculate effective plugin configuration if the plugin is not a reporting plugin
Modified:
maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java?rev=1465338&r1=1465337&r2=1465338&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java Sun Apr 7 07:49:58 2013
@@ -185,7 +185,7 @@ public class DefaultMavenReportExecutor
if ( reportPlugin.getReportSets().isEmpty() && reportPlugin.getReports().isEmpty() )
{
- // by default, execute every reports (goals)
+ // by default, use every goal, which will be filtered later to only keep reporting goals
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
for ( MojoDescriptor mojoDescriptor : mojoDescriptors )
{
@@ -220,24 +220,25 @@ public class DefaultMavenReportExecutor
MojoExecution mojoExecution = new MojoExecution( plugin, report.getGoal(), "report:" + report.getGoal() );
- mojoExecution.setConfiguration( mergeConfiguration( mojoDescriptor.getMojoConfiguration(),
- reportPlugin.getConfiguration(),
- report.getConfiguration(),
- mojoDescriptor.getParameterMap().keySet() ) );
-
mojoExecution.setMojoDescriptor( mojoDescriptor );
mavenPluginManagerHelper.setupPluginRealm( pluginDescriptor, mavenReportExecutorRequest.getMavenSession(),
Thread.currentThread().getContextClassLoader(), IMPORTS,
EXCLUDES );
- MavenReport mavenReport =
- getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
- if ( mavenReport == null )
+ if ( !isMavenReport( mojoExecution, pluginDescriptor ) )
{
continue;
}
+ mojoExecution.setConfiguration( mergeConfiguration( mojoDescriptor.getMojoConfiguration(),
+ reportPlugin.getConfiguration(),
+ report.getConfiguration(),
+ mojoDescriptor.getParameterMap().keySet() ) );
+
+ MavenReport mavenReport =
+ getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
+
MavenReportExecution mavenReportExecution =
new MavenReportExecution( mojoExecution.getPlugin(), mavenReport, pluginDescriptor.getClassRealm() );
@@ -278,11 +279,6 @@ public class DefaultMavenReportExecutor
{
try
{
- if ( !isMavenReport( mojoExecution, pluginDescriptor ) )
- {
- return null;
- }
-
Mojo mojo = mavenPluginManager.getConfiguredMojo( Mojo.class,
mavenReportExecutorRequest.getMavenSession(),
mojoExecution );