You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/04/29 21:44:52 UTC
svn commit: r769896 -
/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: sisbell
Date: Wed Apr 29 19:44:52 2009
New Revision: 769896
URL: http://svn.apache.org/viewvc?rev=769896&view=rev
Log:
Added in LifecycleExecutor to DefaultMavenProjectBuilder. This cause cyclical component dep.
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=769896&r1=769895&r2=769896&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Apr 29 19:44:52 2009
@@ -34,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.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Build;
import org.apache.maven.model.DomainModel;
import org.apache.maven.model.Model;
@@ -70,6 +71,9 @@
@Requirement
private ModelValidator validator;
+
+ @Requirement
+ private LifecycleExecutor lifecycle;
@Requirement
private RepositorySystem repositorySystem;
@@ -166,7 +170,7 @@
MavenProject project;
try {
Model model = interpolateDomainModel( domainModel, configuration, pomFile );
- ProcessorContext.addPluginsToModel(model, configuration.getPlugins());
+ ProcessorContext.addPluginsToModel(model, lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging()));
ProcessorContext.processManagementNodes(model);
project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile);