Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4151A200B8A for ; Sat, 24 Sep 2016 17:19:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 40248160AE5; Sat, 24 Sep 2016 15:19:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7F200160AE4 for ; Sat, 24 Sep 2016 17:19:27 +0200 (CEST) Received: (qmail 85090 invoked by uid 500); 24 Sep 2016 15:19:24 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 84002 invoked by uid 99); 24 Sep 2016 15:19:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Sep 2016 15:19:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1307F0BEC; Sat, 24 Sep 2016 15:19:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: khmarbaise@apache.org To: commits@maven.apache.org Date: Sat, 24 Sep 2016 15:19:45 -0000 Message-Id: In-Reply-To: <4a6a217db89e4c02a1c00e3eb39c87fc@git.apache.org> References: <4a6a217db89e4c02a1c00e3eb39c87fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/33] maven git commit: [MNG-6074] Maven should produce an error if no model version has been set in a POM file used to build an effective model. archived-at: Sat, 24 Sep 2016 15:19:28 -0000 [MNG-6074] Maven should produce an error if no model version has been set in a POM file used to build an effective model. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/744b98e8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/744b98e8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/744b98e8 Branch: refs/heads/MNG-6056-feature-toggle Commit: 744b98e8cf9f2fbe4f73b07927a2c697e8cc6fc2 Parents: 3681fd8 Author: Christian Schulte Authored: Sun Jul 31 18:49:17 2016 +0200 Committer: Christian Schulte Committed: Sun Jul 31 18:49:17 2016 +0200 ---------------------------------------------------------------------- .../maven/model/validation/DefaultModelValidator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/744b98e8/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java ---------------------------------------------------------------------- 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 cdd6c37..5f4f577 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 @@ -100,9 +100,15 @@ public class DefaultModelValidator if ( request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 ) { Severity errOn30 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_0 ); - Severity errOn31 = getSeverity( request, ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 ); - validateStringNotEmpty( "modelVersion", problems, errOn31, Version.V20, m.getModelVersion(), m ); + // [MNG-6074] Maven should produce an error if no model version has been set in a POM file used to build an + // effective model. + // + // As of 3.4, the model version is mandatory even in raw models. The XML element still is optional in the + // XML schema and this will not change anytime soon. We do not want to build effective models based on + // models without a version starting with 3.4. + validateStringNotEmpty( "modelVersion", problems, Severity.ERROR, Version.V20, m.getModelVersion(), m ); + validateEnum( "modelVersion", problems, Severity.ERROR, Version.V20, m.getModelVersion(), null, m, "4.0.0" );