Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jason van Zyl 2009-05-05 14:41:08 +00:00
parent 91f871a2e5
commit 826881819b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
View File

@ -67,7 +67,7 @@ public class DefaultArtifactFilterManager
artifacts.add( "plexus-component-api" ); artifacts.add( "plexus-component-api" );
artifacts.add( "plexus-container-default" ); artifacts.add( "plexus-container-default" );
artifacts.add( "plexus-interactivity-api" ); artifacts.add( "plexus-interactivity-api" );
artifacts.add( "plexus-interpolation" ); //artifacts.add( "plexus-interpolation" );
artifacts.add( "wagon-provider-api" ); artifacts.add( "wagon-provider-api" );
artifacts.add( "wagon-file" ); artifacts.add( "wagon-file" );
artifacts.add( "wagon-http-lightweight" ); artifacts.add( "wagon-http-lightweight" );

10
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
View File

@ -182,10 +182,10 @@ public class DefaultLifecycleExecutor
{ {
try try
{ {
logger.info( executionDescription( mojoExecution ) ); logger.info( executionDescription( mojoExecution, project ) );
mojoExecution.getMojoDescriptor().getRealm().display(); // mojoExecution.getMojoDescriptor().getRealm().display();
// System.out.println( "!!!"); // System.out.println( "!!!");
// System.out.println( mojoExecution.getConfiguration() ); System.out.println( mojoExecution.getConfiguration() );
pluginManager.executeMojo( session, mojoExecution ); pluginManager.executeMojo( session, mojoExecution );
} }
catch ( PluginExecutionException e ) 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(); PluginDescriptor pd = me.getMojoDescriptor().getPluginDescriptor();
StringBuffer sb = new StringBuffer(); 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(); return sb.toString();
} }