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

Plugin was picking up default plugin groupId, which was causing resolve of plugins to fail. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@770433 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Britton Isbell 2009-04-30 20:26:13 +00:00
parent 12ffdd1277
commit 383a8b006a
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -91,7 +91,7 @@ public class DefaultMaven
MavenExecutionResult result = new DefaultMavenExecutionResult();
MavenSession session = createMavenSession( request, result );
if ( session.getReactorManager().hasMultipleProjects() )
{
//logger.info( "Reactor build order: " );

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

@ -182,7 +182,7 @@ public class DefaultMavenProjectBuilder
ProcessorContext.processManagementNodes(model);
project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile);
ArrayList<Plugin> pln = new ArrayList<Plugin>();
for(Plugin p : project.getModel().getBuild().getPlugins())
{
@ -190,7 +190,7 @@ public class DefaultMavenProjectBuilder
PluginProcessor.copy2(p, copy, true);
pln.add(copy);
}
Set<Plugin> pl = lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(pln),
project, configuration.getLocalRepository());
/*
@ -225,6 +225,7 @@ public class DefaultMavenProjectBuilder
}
project.getModel().getBuild().setPlugins(new ArrayList<Plugin>(pl));
}
catch (IOException e)
{
@ -252,7 +253,15 @@ public class DefaultMavenProjectBuilder
return project;
}
private static void printPlugin(Plugin plugin, String tag)
{
System.out.println(tag + ":" + plugin);
System.out.println("CONFIG:" + plugin.getConfiguration());
for(PluginExecution pe : plugin.getExecutions())
{
System.out.println("PE:" + pe.getConfiguration());
}
}
private static PluginExecution contains(String goal, List<PluginExecution> plugins)
{

7
maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
View File

@ -188,7 +188,7 @@ public class PluginProcessor
target.setArtifactId( source.getArtifactId() );
}
if(target.getGroupId() == null)
if(target.getGroupId() == null || !source.getGroupId().equals("org.apache.maven.plugins"))
{
target.setGroupId( source.getGroupId() );
}
@ -352,9 +352,10 @@ public class PluginProcessor
}
else
{
target.setConfiguration( new Xpp3Dom( (Xpp3Dom) source.getConfiguration()) );
//System.out.println("+++++++++++COPY PE+++++++++++++++++" + target.getConfiguration());
}
}
}
}
}