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

o comment out plugin configuration merging code, this should all be handled by the pom builder now. none of this can happen in the plugin manager as its responsibility is purely executing plugins for the framework 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769860 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-04-29 18:06:28 +00:00
parent 16fc5b6fd3
commit 0d5dc4b4a3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,8 +307,14 @@ private Set<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin plugin
// followed by the plugin's default artifact set
dependencies.addAll( pluginArtifacts );
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact( pluginArtifact ).setArtifactDependencies( dependencies ).setLocalRepository( localRepository )
.setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) ).setManagedVersionMap( pluginManagedDependencies ).setFilter( filter ).setResolveRoot( false ); // We are setting this to false because the artifact itself has been resolved.
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
.setArtifact( pluginArtifact )
.setArtifactDependencies( dependencies )
.setLocalRepository( localRepository )
.setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) )
.setManagedVersionMap( pluginManagedDependencies )
.setFilter( filter )
.setResolveRoot( false ); // We are setting this to false because the artifact itself has been resolved.
ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result );
@ -392,6 +398,7 @@ public void executeMojo( MavenSession session, MojoExecution mojoExecution )
// Merge the plugin level configuration with the execution level configuration
// where the latter is dominant.
/*
if ( project.getBuildPlugins() != null )
{
for ( Plugin buildPlugin : project.getBuildPlugins() )
@ -422,6 +429,7 @@ public void executeMojo( MavenSession session, MojoExecution mojoExecution )
}
}
}
*/
String goalExecId = goalName;
if ( mojoExecution.getExecutionId() != null )