Repository: maven Updated Branches: refs/heads/master 6755560a7 -> 70653f3e4
[MNG-6127] Fix plugin execution configuration interference This closes #99 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/70653f3e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/70653f3e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/70653f3e Branch: refs/heads/master Commit: 70653f3e46f7779e10a71517e7da8ac4d004c0bd Parents: 6755560 Author: Mario Krizmanic <mario.krizma...@gmail.com> Authored: Wed Nov 23 22:11:56 2016 +0100 Committer: Christian Schulte <schu...@apache.org> Committed: Thu Nov 24 08:28:11 2016 +0100 ---------------------------------------------------------------------- .../lifecycle/internal/DefaultLifecyclePluginAnalyzer.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/70653f3e/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index b4f981d..66c3202 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -43,6 +43,7 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.plexus.util.xml.Xpp3Dom; /** * @since 3.0 @@ -249,7 +250,12 @@ public class DefaultLifecyclePluginAnalyzer execution.setPhase( phase ); execution.setPriority( i - mojos.size() ); execution.getGoals().add( gs.goal ); - execution.setConfiguration( mojo.getConfiguration() ); + + Xpp3Dom lifecycleConfiguration = mojo.getConfiguration(); + if ( lifecycleConfiguration != null ) + { + execution.setConfiguration( new Xpp3Dom( lifecycleConfiguration ) ); + } plugin.setDependencies( mojo.getDependencies() ); plugin.getExecutions().add( execution );
