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

o Fixed extension realm to consider project-level plugin dependencies as well 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@799831 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-01 11:06:14 +00:00
parent b3f852ee64
commit ea10476bf9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
View File

@ -21,7 +21,9 @@ package org.apache.maven.project;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import org.apache.maven.ArtifactFilterManager;
import org.apache.maven.artifact.Artifact;
@ -32,6 +34,7 @@ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
@ -155,14 +158,20 @@ public class DefaultProjectBuildingHelper
repositorySystem.createArtifact( extension.getGroupId(), extension.getArtifactId(),
extension.getVersion(), "jar" );
populateRealm( projectRealm, artifact, localRepository, remoteRepositories );
populateRealm( projectRealm, artifact, null, localRepository, remoteRepositories );
}
for ( Plugin plugin : extensionPlugins )
{
Artifact artifact = repositorySystem.createPluginArtifact( plugin );
populateRealm( projectRealm, artifact, localRepository, remoteRepositories );
Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
for ( Dependency dependency : plugin.getDependencies() )
{
dependencies.add( repositorySystem.createDependencyArtifact( dependency ) );
}
populateRealm( projectRealm, artifact, dependencies, localRepository, remoteRepositories );
}
try
@ -177,18 +186,19 @@ public class DefaultProjectBuildingHelper
return projectRealm;
}
private void populateRealm( ClassRealm realm, Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
private void populateRealm( ClassRealm realm, Artifact artifact, Set<Artifact> dependencies,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactResolutionException
{
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setArtifact( artifact );
request.setArtifactDependencies( dependencies );
request.setResolveTransitively( true );
request.setFilter( artifactFilterManager.getCoreArtifactFilter() );
request.setLocalRepository( localRepository );
request.setRemoteRepostories( remoteRepositories );
// FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result );

4
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
View File

@ -104,6 +104,10 @@ public class DefaultPluginManagementInjector
{
mergePlugin_Version( element, managedPlugin, false, context );
mergePlugin_Extensions( element, managedPlugin, false, context );
if ( element.isExtensions() )
{
mergePlugin_Dependencies( element, managedPlugin, false, context );
}
}
else
{