From 826881819ba6d8e5ee57ca180c1d751740e267ae Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Tue, 5 May 2009 14:41:08 +0000 Subject: [PATCH] o don't filter out the plexus-interpolation o show the project for which the mojo is executing git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@771751 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/DefaultArtifactFilterManager.java | 2 +- .../maven/lifecycle/DefaultLifecycleExecutor.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index 4fbf1962bc..1b4f1dc7fe 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -67,7 +67,7 @@ public class DefaultArtifactFilterManager artifacts.add( "plexus-component-api" ); artifacts.add( "plexus-container-default" ); artifacts.add( "plexus-interactivity-api" ); - artifacts.add( "plexus-interpolation" ); + //artifacts.add( "plexus-interpolation" ); artifacts.add( "wagon-provider-api" ); artifacts.add( "wagon-file" ); artifacts.add( "wagon-http-lightweight" ); diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java index 0544a144ec..900b50d7aa 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java @@ -182,10 +182,10 @@ public class DefaultLifecycleExecutor { try { - logger.info( executionDescription( mojoExecution ) ); - mojoExecution.getMojoDescriptor().getRealm().display(); + logger.info( executionDescription( mojoExecution, project ) ); +// mojoExecution.getMojoDescriptor().getRealm().display(); // System.out.println( "!!!"); -// System.out.println( mojoExecution.getConfiguration() ); + System.out.println( mojoExecution.getConfiguration() ); pluginManager.executeMojo( session, mojoExecution ); } catch ( PluginExecutionException e ) @@ -201,11 +201,11 @@ public class DefaultLifecycleExecutor } } - private String executionDescription( MojoExecution me ) + private String executionDescription( MojoExecution me, MavenProject project ) { PluginDescriptor pd = me.getMojoDescriptor().getPluginDescriptor(); StringBuffer sb = new StringBuffer(); - sb.append( "Executing " + pd.getArtifactId() + "[" + pd.getVersion() + "]: " + me.getMojoDescriptor().getGoal() ); + sb.append( "Executing " + pd.getArtifactId() + "[" + pd.getVersion() + "]: " + me.getMojoDescriptor().getGoal() + " on " + project.getArtifactId() ); return sb.toString(); }