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

o change signature to have the session first 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@760723 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-31 23:13:12 +00:00
parent a8d2eee331
commit 1ce1debe96
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ private void executeGoal( String task, MavenSession session, MavenProject projec
try
{
pluginManager.executeMojo( project, mojoExecution, session );
pluginManager.executeMojo( session, mojoExecution );
}
catch ( MojoFailureException e )
{

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

@ -353,7 +353,7 @@ private Set<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin plugin
// We should assume that We've already loaded the plugin in question.
public void executeMojo( MojoExecution mojoExecution, MavenSession session )
public void executeMojo( MavenSession session, MojoExecution mojoExecution )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException
{
MavenProject project = session.getCurrentProject();

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

@ -39,6 +39,6 @@ PluginDescriptor loadPlugin( Plugin plugin, MavenProject project, MavenSession s
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, MavenSession session )
throws PluginLoaderException;
void executeMojo( MojoExecution execution, MavenSession session )
void executeMojo( MavenSession session, MojoExecution execution )
throws MojoFailureException, PluginExecutionException, PluginConfigurationException;
}

4
maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
View File

@ -87,7 +87,7 @@ public void testRemoteResourcesPlugin()
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.1" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
pluginManager.executeMojo( mojoExecution, session );
pluginManager.executeMojo( session, mojoExecution );
}
public void testSurefirePlugin()
@ -104,7 +104,7 @@ public void testSurefirePlugin()
MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session );
assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" );
MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
pluginManager.executeMojo( mojoExecution, session );
pluginManager.executeMojo( session, mojoExecution );
}
// -----------------------------------------------------------------------------------------------