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 2017/12/20 09:35:46 UTC
[maven-invoker-plugin] 04/24: Cleaning up output and fixing
single-pom override parameter.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to annotated tag maven-invoker-plugin-1.0
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git
commit 444329bc01b07942ee2bc771afc5cbe14e286e0c
Author: John Dennis Casey <jd...@apache.org>
AuthorDate: Fri Aug 11 18:59:44 2006 +0000
Cleaning up output and fixing single-pom override parameter.
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-invoker-plugin@430859 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/maven/plugin/invoker/InvokerMojo.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java b/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
index dff9799..8b5b288 100644
--- a/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
@@ -29,7 +29,6 @@ import org.apache.maven.shared.invoker.Invoker;
import org.apache.maven.shared.invoker.MavenInvocationException;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
-import org.apache.maven.wagon.PathUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -215,10 +214,16 @@ public class InvokerMojo
private void runBuild( final String pom, final List failures )
throws MojoExecutionException
{
- final File pomFile = new File( projectsDirectory, pom );
+ File pomFile = new File( pom );
+
+ if ( !pomFile.isAbsolute() )
+ {
+ pomFile = new File( projectsDirectory, pom );
+ }
+
final File basedir = pomFile.getParentFile();
- getLog().info( "Building: " + basedir );
+ getLog().info( "Building: " + pom );
final File outputLog = new File( basedir, "target/build.log" );
@@ -513,7 +518,7 @@ public class InvokerMojo
if ( goals != null && !goals.isEmpty() )
{
- getLog().info( "Using goals specified in file: " + projectGoalList );
+ getLog().debug( "Using goals specified in file: " + projectGoalList );
invocationGoals = goals;
}
}
@@ -527,7 +532,7 @@ public class InvokerMojo
{
if ( pom != null && pom.exists() )
{
- return new String[]{ PathUtils.toRelative( projectsDirectory, pom.getAbsolutePath() ) };
+ return new String[]{ pom.getAbsolutePath() };
}
else
{
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.