From 546eb980a843c72630cdb0448a95c17cbab6f059 Mon Sep 17 00:00:00 2001
From: Mario Krizmanic <mario.krizmanic@gmail.com>
Date: Wed, 23 Nov 2016 22:11:56 +0100
Subject: [PATCH] [MNG-6127] Fix plugin execution configuration interference

---
 .../internal/DefaultLifecyclePluginAnalyzer.java          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 b4f981d719cd..66c3202cfe01 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.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 @@ private void parseLifecyclePhaseDefinitions( Map<Plugin, Plugin> plugins, String
                 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 );