From 383a8b006aa14e315904fc4bb08aea765b110cf2 Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Thu, 30 Apr 2009 20:26:13 +0000 Subject: [PATCH] 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 --- .../main/java/org/apache/maven/DefaultMaven.java | 2 +- .../maven/project/DefaultMavenProjectBuilder.java | 15 ++++++++++++--- .../maven/model/processors/PluginProcessor.java | 7 ++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index b65acaafff..81ac23c3e7 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -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: " ); diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java index 3cd57dcb63..a6e14e8f2f 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java @@ -182,7 +182,7 @@ public class DefaultMavenProjectBuilder ProcessorContext.processManagementNodes(model); project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile); - + ArrayList pln = new ArrayList(); for(Plugin p : project.getModel().getBuild().getPlugins()) { @@ -190,7 +190,7 @@ public class DefaultMavenProjectBuilder PluginProcessor.copy2(p, copy, true); pln.add(copy); } - + Set pl = lifecycle.populateDefaultConfigurationForPlugins(new HashSet(pln), project, configuration.getLocalRepository()); /* @@ -225,6 +225,7 @@ public class DefaultMavenProjectBuilder } project.getModel().getBuild().setPlugins(new ArrayList(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 plugins) { diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java index 05edecb2c4..12de750d02 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java @@ -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()); } - } - + } } }