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

Checking in work on populating plugins configs. Some problem with finding wagon for http protocol is causing build to fail. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@769934 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-29 21:10:03 +00:00
parent c89d8d495b
commit c0306a2ef4
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -22,9 +22,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@ -34,11 +36,13 @@
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.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Build;
import org.apache.maven.model.DomainModel;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelEventListener;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ProcessorContext;
import org.apache.maven.model.Profile;
import org.apache.maven.model.interpolator.Interpolator;
@ -87,6 +91,13 @@ public class DefaultMavenProjectBuilder
@Requirement
private ResolutionErrorHandler resolutionErrorHandler;
//DO NOT USE, it is here only for backward compatibility reasons. The existing
// maven-assembly-plugin (2.2-beta-1) is accessing it via reflection.
// the aspect weaving seems not to work for reflection from plugin.
private Map processedProjectCache = new HashMap();
private static HashMap<String, MavenProject> hm = new HashMap<String, MavenProject>();
private MavenProject superProject;
@ -161,15 +172,28 @@ public MavenProject build( File pomFile, ProjectBuilderConfiguration configurati
//Interpolation & Management
MavenProject project;
try {
try
{
Model model = interpolateDomainModel( domainModel, configuration, pomFile );
ProcessorContext.addPluginsToModel(model, lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging()));
Set<Plugin> plugins = lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging());
ProcessorContext.addPluginsToModel(model, plugins);
ProcessorContext.processManagementNodes(model);
project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile);
} catch (IOException e) {
plugins = lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(model.getBuild().getPlugins()),
project, configuration.getLocalRepository());
project.getModel().getBuild().setPlugins(new ArrayList<Plugin>(plugins));
}
catch (IOException e)
{
throw new ProjectBuildingException("", "");
}
catch (LifecycleExecutionException e)
{
e.printStackTrace();
throw new ProjectBuildingException("",e.getMessage());
}
project.setActiveProfiles( projectProfiles );
@ -184,7 +208,7 @@ public MavenProject build( File pomFile, ProjectBuilderConfiguration configurati
setBuildOutputDirectoryOnParent( project );
hm.put( ArtifactUtils.artifactId( project.getGroupId(), project.getArtifactId(), "pom", project.getVersion() ), project );
return project;
}

1
maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
View File

@ -275,7 +275,6 @@ public static void addPluginsToModel(Model target, Set<Plugin> plugins)
{
if( !containsPlugin( p, mPlugins) )
{
p.setConfiguration(null);
lifecyclePlugins.add(p);
}
}