You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by an...@apache.org on 2013/03/01 15:34:12 UTC
svn commit: r1451600 -
/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Author: andham
Date: Fri Mar 1 14:34:12 2013
New Revision: 1451600
URL: http://svn.apache.org/r1451600
Log:
Some clean ups
Modified:
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1451600&r1=1451599&r2=1451600&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Fri Mar 1 14:34:12 2013
@@ -661,7 +661,7 @@ public abstract class AbstractInvokerMoj
catch ( IOException e )
{
throw new MojoExecutionException(
- "Failed to discover projectsDirectory from pom File parameter." + " Reason: " + e.getMessage(), e );
+ "Failed to discover projectsDirectory from pom File parameter. Reason: " + e.getMessage(), e );
}
buildJobs = new BuildJob[]{ new BuildJob( pom.getName(), BuildJob.Type.NORMAL ) };
@@ -675,7 +675,7 @@ public abstract class AbstractInvokerMoj
catch ( final IOException e )
{
throw new MojoExecutionException(
- "Error retrieving POM list from includes, excludes, " + "and projects directory. Reason: "
+ "Error retrieving POM list from includes, excludes, and projects directory. Reason: "
+ e.getMessage(), e );
}
}
@@ -1161,7 +1161,6 @@ public abstract class AbstractInvokerMoj
getLog().debug(
"Created temporary file for invoker settings.xml: " + mergedSettingsFile.getAbsolutePath() );
}
-
}
catch ( IOException e )
{
@@ -1199,7 +1198,6 @@ public abstract class AbstractInvokerMoj
{
executorService.execute( new Runnable()
{
-
public void run()
{
try
@@ -1224,7 +1222,6 @@ public abstract class AbstractInvokerMoj
{
throw new MojoExecutionException( e.getMessage(), e );
}
-
}
else
{
@@ -1244,7 +1241,6 @@ public abstract class AbstractInvokerMoj
{
mergedSettingsFile.delete();
}
-
}
}
@@ -1390,7 +1386,6 @@ public abstract class AbstractInvokerMoj
if ( executed )
{
-
buildJob.setResult( BuildJob.Result.SUCCESS );
if ( !suppressSummaries )
@@ -1756,7 +1751,7 @@ public abstract class AbstractInvokerMoj
logger = new FileLogger( outputLog );
}
- getLog().debug( "build log initialized in: " + outputLog );
+ getLog().debug( "Build log initialized in: " + outputLog );
}
catch ( IOException e )
{
@@ -1965,7 +1960,10 @@ public abstract class AbstractInvokerMoj
}
BuildJob[] setupPoms = scanProjectsDirectory( setupIncludes, excludes, BuildJob.Type.SETUP );
- getLog().debug( "Setup projects: " + Arrays.asList( setupPoms ) );
+ if ( getLog().isDebugEnabled() )
+ {
+ getLog().debug( "Setup projects: " + Arrays.asList( setupPoms ) );
+ }
BuildJob[] normalPoms = scanProjectsDirectory( pomIncludes, excludes, BuildJob.Type.NORMAL );