svn commit: r769906 - /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

[jv...@apache.org]

Author: jvanzyl
Date: Wed Apr 29 20:08:15 2009
New Revision: 769906

URL: http://svn.apache.org/viewvc?rev=769906&view=rev
Log:
o remove the project builder from the plugin manager

Modified:
    maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=769906&r1=769905&r2=769906&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Apr 29 20:08:15 2009
@@ -46,9 +46,7 @@
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.RuntimeInformation;
-import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
 import org.apache.maven.monitor.logging.DefaultLog;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.plugin.descriptor.Parameter;
@@ -56,8 +54,6 @@
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.apache.maven.project.DuplicateArtifactAttachmentException;
 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.repository.RepositorySystem;
 import org.apache.maven.repository.VersionNotFoundException;
@@ -95,6 +91,9 @@
 // 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
 // about how that works
+// TODO: remove the ProjectBuilder
+// TODO: remove the coreArtifactFilterManager
+// TODO: remove the runtimeInformation
 
 @Component(role = PluginManager.class)
 public class DefaultPluginManager
@@ -118,9 +117,6 @@
     @Requirement
     protected RuntimeInformation runtimeInformation;
 
-    @Requirement
-    protected MavenProjectBuilder mavenProjectBuilder;
-
     private Map<String, PluginDescriptor> pluginDescriptors;
 
     public DefaultPluginManager()
@@ -189,11 +185,11 @@
     {
         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 );
 
-        checkRequiredMavenVersion( plugin, pluginProject, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
+        //checkRequiredMavenVersion( plugin, pluginProject, localRepository, new ArrayList( project.getRemoteArtifactRepositories() ) );
 
         pluginArtifact = project.replaceWithActiveArtifact( pluginArtifact );
 
@@ -276,6 +272,7 @@
 
         List<Artifact> pluginArtifacts = new ArrayList<Artifact>();
 
+        /*
         try
         {
             Artifact pluginPomArtifact = repositorySystem.createProjectArtifact( pluginArtifact.getGroupId(), pluginArtifact.getArtifactId(), pluginArtifact.getVersion() );
@@ -298,6 +295,7 @@
         {
             throw new InvalidPluginException( "Error resolving plugin POM " + e.getMessage() );
         }
+        */
 
         Set<Artifact> dependencies = new LinkedHashSet<Artifact>();
 
@@ -314,7 +312,7 @@
             .setRemoteRepostories( new ArrayList( project.getRemoteArtifactRepositories() ) )
             .setManagedVersionMap( pluginManagedDependencies )
             .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 );
         resolutionErrorHandler.throwErrors( request, result );
@@ -941,6 +939,7 @@
         plugin.setVersion( version );
     }
 
+    /*
     public MavenProject buildPluginProject( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
         throws InvalidPluginException
     {
@@ -956,6 +955,7 @@
             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 )
         throws PluginVersionResolutionException, InvalidPluginException