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 2016/09/10 15:48:14 UTC
svn commit: r1760185 -
/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Author: hboutemy
Date: Sat Sep 10 15:48:14 2016
New Revision: 1760185
URL: http://svn.apache.org/viewvc?rev=1760185&view=rev
Log:
[MSHARED-590] prepended report goal by plugin artifactid
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=1760185&r1=1760184&r2=1760185&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 Sat Sep 10 15:48:14 2016
@@ -292,27 +292,25 @@ public class DefaultMavenReportExecutor
if ( !mojoExecution.getForkedExecutions().isEmpty() )
{
- String execution;
- if ( StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() ) )
- {
- // forked phase
- execution = "'"
- + ( StringUtils.isEmpty( mojoDescriptor.getExecuteLifecycle() ) ? ""
- : ( '[' + mojoDescriptor.getExecuteLifecycle() + ']' ) )
- + mojoDescriptor.getExecutePhase() + "' forked phase execution";
- }
- else
- {
- // forked goal
- execution = "'" + mojoDescriptor.getExecuteGoal() + "' forked goal execution";
- }
+ String reportDescription = pluginDescriptor.getArtifactId() + ":" + report.getGoal() + " report";
- logger.info( "preparing '" + report.getGoal() + "' report requires " + execution );
+ String execution;
+ if (StringUtils.isNotEmpty(mojoDescriptor.getExecutePhase())) {
+ // forked phase
+ execution = "'"
+ + (StringUtils.isEmpty(mojoDescriptor.getExecuteLifecycle()) ? ""
+ : ('[' + mojoDescriptor.getExecuteLifecycle() + ']'))
+ + mojoDescriptor.getExecutePhase() + "' forked phase execution";
+ } else {
+ // forked goal
+ execution = "'" + mojoDescriptor.getExecuteGoal() + "' forked goal execution";
+ }
- lifecycleExecutor.executeForkedExecutions( mojoExecution,
- mavenReportExecutorRequest.getMavenSession() );
+ logger.info("preparing " + reportDescription + " requires " + execution);
- logger.info( execution + " for '" + report.getGoal() + "' report preparation done" );
+ lifecycleExecutor.executeForkedExecutions(mojoExecution, mavenReportExecutorRequest.getMavenSession());
+
+ logger.info(execution + " for " + reportDescription + " preparation done");
}
// ok, report is ready to generate