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 14:48:57 UTC
svn commit: r1760178 -
/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
Author: hboutemy
Date: Sat Sep 10 14:48:57 2016
New Revision: 1760178
URL: http://svn.apache.org/viewvc?rev=1760178&view=rev
Log:
[MSHARED-589] improved after forked execution
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=1760178&r1=1760177&r2=1760178&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 14:48:57 2016
@@ -292,28 +292,27 @@ public class DefaultMavenReportExecutor
if ( !mojoExecution.getForkedExecutions().isEmpty() )
{
- String msg = "preparing '" + report.getGoal() + "' report requires '";
- boolean isPhase = StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() );
- if ( isPhase )
+ String execution;
+ if ( StringUtils.isNotEmpty( mojoDescriptor.getExecutePhase() ) )
{
// forked phase
- String lifecycleId =
- StringUtils.isEmpty( mojoDescriptor.getExecuteLifecycle() ) ? ""
- : ( '[' + mojoDescriptor.getExecuteLifecycle() + ']' );
- logger.info( msg + lifecycleId + mojoDescriptor.getExecutePhase() + "' forked phase execution" );
+ execution = "'"
+ + ( StringUtils.isEmpty( mojoDescriptor.getExecuteLifecycle() ) ? ""
+ : ( '[' + mojoDescriptor.getExecuteLifecycle() + ']' ) )
+ + mojoDescriptor.getExecutePhase() + "' forked phase execution";
}
else
{
// forked goal
- logger.info( msg + mojoDescriptor.getExecuteGoal() + "' forked goal execution" );
+ execution = "'" + mojoDescriptor.getExecuteGoal() + "' forked goal execution";
}
+ logger.info( "preparing '" + report.getGoal() + "' report requires " + execution );
+
lifecycleExecutor.executeForkedExecutions( mojoExecution,
mavenReportExecutorRequest.getMavenSession() );
- logger.info( "" );
- logger.info( "forked " + ( isPhase ? "phase" : "goal" ) + " execution for '" + report.getGoal()
- + "' report preparation done" );
+ logger.info( execution + " for '" + report.getGoal() + "' report preparation done" );
}
// ok, report is ready to generate