This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-7804-plugin-execution-order-3.9 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 09da49232dbce8e4e127c3842b1a92a6449e8587 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jun 5 09:58:44 2023 +0200 [MNG-7804] Ability to order plugin executions using the priority xml element --- .../src/test/resources/projects/future-model-version-pom.xml | 2 +- .../apache/maven/model/validation/DefaultModelValidator.java | 2 +- maven-model/src/main/mdo/maven.mdo | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/maven-core/src/test/resources/projects/future-model-version-pom.xml b/maven-core/src/test/resources/projects/future-model-version-pom.xml index 1a73a4443..c8db47aed 100644 --- a/maven-core/src/test/resources/projects/future-model-version-pom.xml +++ b/maven-core/src/test/resources/projects/future-model-version-pom.xml @@ -18,7 +18,7 @@ under the License. --> <project> - <modelVersion>4.0.1</modelVersion> + <modelVersion>4.999.1</modelVersion> <groupId>tests.project</groupId> <artifactId>future-model-version</artifactId> <version>1</version> diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java index 7049f5c21..a167bcc34 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java @@ -135,7 +135,7 @@ public class DefaultModelValidator implements ModelValidator { // models without a version starting with 3.4. validateStringNotEmpty("modelVersion", problems, Severity.ERROR, Version.V20, m.getModelVersion(), m); - validateModelVersion(problems, m.getModelVersion(), m, "4.0.0"); + validateModelVersion(problems, m.getModelVersion(), m, "4.0.0", "4.2.0"); validateStringNoExpression("groupId", problems, Severity.WARNING, Version.V20, m.getGroupId(), m); if (parent == null) { diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 2bd344e1b..ba90c49cf 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -2565,7 +2565,7 @@ </field> <field xml.transient="true"> <name>priority</name> - <version>4.0.0+</version> + <version>4.0.0/4.1.0</version> <type>int</type> <description> <![CDATA[ @@ -2576,6 +2576,15 @@ ]]> </description> </field> + <field> + <name>priority</name> + <version>4.2.0+</version> + <type>int</type> + <description>The priority of this execution compared to other executions which are bound to the same phase. + Executions derived from the default lifecycle have a negative priority by default so that they are executed + before any custom plugin executions. + </description> + </field> <field> <name>goals</name> <version>4.0.0+</version>
