svn commit: r812480 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java

[bentmann]

Author: bentmann
Date: Tue Sep  8 12:23:24 2009
New Revision: 812480

URL: http://svn.apache.org/viewvc?rev=812480&view=rev
Log:
[MNG-4345] [regression] Plugin executions contributed by default lifecycle 
mapping execute after other plugin executions bound to the same phase

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java?rev=812480&r1=812479&r2=812480&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
 Tue Sep  8 12:23:24 2009
@@ -33,6 +33,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.building.ModelBuildingRequest;
 import org.apache.maven.model.building.ModelProblemCollector;
@@ -180,6 +181,16 @@
                 target.setPlugins( result );
             }
         }
+
+        @Override
+        protected void mergePluginExecution( PluginExecution target, 
PluginExecution source, boolean sourceDominant,
+                                             Map<Object, Object> context )
+        {
+            super.mergePluginExecution( target, source, sourceDominant, 
context );
+
+            target.setPriority( Math.min( target.getPriority(), 
source.getPriority() ) );
+        }
+
     }
 
 }