You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/08/04 12:27:02 UTC
maven git commit: Fix plugin execution configuration interference
Repository: maven
Updated Branches:
refs/heads/MNG-6127 [created] 57e4b331e
Fix plugin execution configuration interference
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/57e4b331
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/57e4b331
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/57e4b331
Branch: refs/heads/MNG-6127
Commit: 57e4b331ebd41ab5337c60a7c8fc4d3d435475fb
Parents: a1fe421
Author: Mario Krizmanic <ma...@gmail.com>
Authored: Mon Apr 10 21:06:12 2017 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Fri Aug 4 13:06:58 2017 +0200
----------------------------------------------------------------------
.../internal/DefaultLifecyclePluginAnalyzer.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/57e4b331/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 aec785f..14653b7 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
@@ -31,6 +31,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;
import java.util.ArrayList;
import java.util.Collections;
@@ -190,8 +191,13 @@ 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 );
}