[MNG-6127] Fix plugin execution configuration interference

Signed-off-by: rfscholte <[email protected]>
RichVRed · Aug 15, 2017 · f1ed659 · f1ed659
1 parent 842db37
commit f1ed659
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...ore/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/...ore/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -31,6 31,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;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -190,8 191,13 @@ 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 );
  }