You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/05/05 16:41:08 UTC
svn commit: r771751 - in
/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven:
DefaultArtifactFilterManager.java lifecycle/DefaultLifecycleExecutor.java
Author: jvanzyl
Date: Tue May 5 14:41:08 2009
New Revision: 771751
URL: http://svn.apache.org/viewvc?rev=771751&view=rev
Log:
o don't filter out the plexus-interpolation
o show the project for which the mojo is executing
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=771751&r1=771750&r2=771751&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java Tue May 5 14:41:08 2009
@@ -67,7 +67,7 @@
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" );
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=771751&r1=771750&r2=771751&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Tue May 5 14:41:08 2009
@@ -182,10 +182,10 @@
{
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 @@
}
}
- 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();
}