maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject [1/2] maven git commit: [MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute after other plugin executions bound to the same phase"
Date Mon, 07 Mar 2016 15:54:56 GMT
Repository: maven
Updated Branches:
  refs/heads/master 5a4d54810 -> 4bdb16c93


[MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute
after other plugin executions bound to the same phase"

o Updated to restore correct Maven 3 behaviour fixing unexpected Maven 2
  behaviour.

o This reverts commits
    53b7d5e805910bbe055696ba6b76a6560ef85839
    c249a984084b4143ecfa64dfd26fecfbb199057c


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ceba6860
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ceba6860
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ceba6860

Branch: refs/heads/master
Commit: ceba686009cd21568e002f5a9ebb130c21bf0453
Parents: 5a4d548
Author: Christian Schulte <schulte@apache.org>
Authored: Tue Mar 1 00:50:18 2016 +0100
Committer: Christian Schulte <schulte@apache.org>
Committed: Tue Mar 1 00:55:04 2016 +0100

----------------------------------------------------------------------
 .../model/plugin/DefaultLifecycleBindingsInjector.java | 11 -----------
 maven-model/src/main/mdo/maven.mdo                     | 13 -------------
 2 files changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/ceba6860/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index aa491e7..a4d7138 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -30,7 +30,6 @@ import org.apache.maven.model.Build;
 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.ModelProblem.Severity;
@@ -162,16 +161,6 @@ public class DefaultLifecycleBindingsInjector
                 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() ) );
-        }
-
     }
 
 }

http://git-wip-us.apache.org/repos/asf/maven/blob/ceba6860/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 3f6b6d6..f85d233 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2912,19 +2912,6 @@
           <description>The build lifecycle phase to bind the goals in this execution
to. If omitted,
             the goals will be bound to the default phase specified by the plugin. </description>
         </field>
-        <field xml.transient="true">
-          <name>priority</name>
-          <version>4.0.0+</version>
-          <type>int</type>
-          <description>
-            <![CDATA[
-            The priority of this execution compared to other executions which are bound to
the same phase.
-            <strong>Warning:</strong> This is an internal utility property that
is only public for technical reasons,
-            it is not part of the public API. In particular, this property can be changed
or deleted without prior
-            notice.
-            ]]>
-          </description>
-        </field>
         <field>
           <name>goals</name>
           <version>4.0.0+</version>


Mime
View raw message