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

o remove the project builder from the plugin manager 

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

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

@ -46,9 +46,7 @@ import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.MavenSession; import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.RuntimeInformation; import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin; import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.monitor.logging.DefaultLog; import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.descriptor.MojoDescriptor; import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter; import org.apache.maven.plugin.descriptor.Parameter;
@ -56,8 +54,6 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.project.DuplicateArtifactAttachmentException; import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.VersionNotFoundException; import org.apache.maven.repository.VersionNotFoundException;
@ -95,6 +91,9 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
// TODO: template method plugin validation as its framework specific // TODO: template method plugin validation as its framework specific
// TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think // TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think
// about how that works // about how that works
// TODO: remove the ProjectBuilder
// TODO: remove the coreArtifactFilterManager
// TODO: remove the runtimeInformation
@Component(role = PluginManager.class) @Component(role = PluginManager.class)
public class DefaultPluginManager public class DefaultPluginManager
@ -118,9 +117,6 @@ public class DefaultPluginManager
@Requirement @Requirement
protected RuntimeInformation runtimeInformation; protected RuntimeInformation runtimeInformation;
@Requirement
protected MavenProjectBuilder mavenProjectBuilder;
private Map<String, PluginDescriptor> pluginDescriptors; private Map<String, PluginDescriptor> pluginDescriptors;
public DefaultPluginManager() public DefaultPluginManager()
@ -189,11 +185,11 @@ public class DefaultPluginManager
{ {
resolvePluginVersion( plugin, project ); resolvePluginVersion( plugin, project );
MavenProject pluginProject = buildPluginProject( plugin, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) ); //MavenProject pluginProject = buildPluginProject( plugin, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
Artifact pluginArtifact = repositorySystem.createPluginArtifact( plugin ); Artifact pluginArtifact = repositorySystem.createPluginArtifact( plugin );
checkRequiredMavenVersion( plugin, pluginProject, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) ); //checkRequiredMavenVersion( plugin, pluginProject, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
pluginArtifact = project.replaceWithActiveArtifact( pluginArtifact ); pluginArtifact = project.replaceWithActiveArtifact( pluginArtifact );
@ -276,6 +272,7 @@ public class DefaultPluginManager
List<Artifact> pluginArtifacts = new ArrayList<Artifact>(); List<Artifact> pluginArtifacts = new ArrayList<Artifact>();
/*
try try
{ {
Artifact pluginPomArtifact = repositorySystem.createProjectArtifact( pluginArtifact.getGroupId(), pluginArtifact.getArtifactId(), pluginArtifact.getVersion() ); Artifact pluginPomArtifact = repositorySystem.createProjectArtifact( pluginArtifact.getGroupId(), pluginArtifact.getArtifactId(), pluginArtifact.getVersion() );
@ -298,6 +295,7 @@ public class DefaultPluginManager
{ {
throw new InvalidPluginException( "Error resolving plugin POM " + e.getMessage() ); throw new InvalidPluginException( "Error resolving plugin POM " + e.getMessage() );
} }
*/
Set<Artifact> dependencies = new LinkedHashSet<Artifact>(); Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
@ -314,7 +312,7 @@ public class DefaultPluginManager
.setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) ) .setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) )
.setManagedVersionMap( pluginManagedDependencies ) .setManagedVersionMap( pluginManagedDependencies )
.setFilter( filter ) .setFilter( filter )
.setResolveRoot( false ); // We are setting this to false because the artifact itself has been resolved. .setResolveRoot( true ); // We are setting this to false because the artifact itself has been resolved.
ArtifactResolutionResult result = repositorySystem.resolve( request ); ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result ); resolutionErrorHandler.throwErrors( request, result );
@ -941,6 +939,7 @@ public class DefaultPluginManager
plugin.setVersion( version ); plugin.setVersion( version );
} }
/*
public MavenProject buildPluginProject( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) public MavenProject buildPluginProject( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws InvalidPluginException throws InvalidPluginException
{ {
@ -956,6 +955,7 @@ public class DefaultPluginManager
throw new InvalidPluginException( "Unable to build project for plugin '" + plugin.getKey() + "': " + e.getMessage(), e ); throw new InvalidPluginException( "Unable to build project for plugin '" + plugin.getKey() + "': " + e.getMessage(), e );
} }
} }
*/
public void checkRequiredMavenVersion( Plugin plugin, MavenProject pluginProject, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) public void checkRequiredMavenVersion( Plugin plugin, MavenProject pluginProject, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws PluginVersionResolutionException, InvalidPluginException throws PluginVersionResolutionException, InvalidPluginException