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

PR: MNG-1424 

Fixing addPlugin(..) ordering relative to plugin verification from the lifecycle executor's getMojoDescriptor(..) method, which will ensure that pluginManagement versions take precedence over resolved plugin versions. I'm not sure how to test this  one yet, so I'm not adding anything in that regard yet.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344257 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-11-14 22:55:49 +00:00
parent 5977fedc94
commit 9a0b2544f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1351,15 +1351,15 @@ public class DefaultLifecycleExecutor
throw new BuildFailureException( message ); throw new BuildFailureException( message );
} }
// this has been simplified from the old code that injected the plugin management stuff, since
// pluginManagement injection is now handled by the project method.
project.addPlugin( plugin );
if ( pluginDescriptor == null ) if ( pluginDescriptor == null )
{ {
pluginDescriptor = verifyPlugin( plugin, project, session.getSettings(), session.getLocalRepository() ); pluginDescriptor = verifyPlugin( plugin, project, session.getSettings(), session.getLocalRepository() );
} }
// this has been simplified from the old code that injected the plugin management stuff, since
// pluginManagement injection is now handled by the project method.
project.addPlugin( plugin );
MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal ); MojoDescriptor mojoDescriptor = pluginDescriptor.getMojo( goal );
if ( mojoDescriptor == null ) if ( mojoDescriptor == null )
{ {