allow custom Model dependency version validation rules

Signed-off-by: Igor Fedorenko <[email protected]>


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

Branch: refs/heads/master
Commit: 8788c90abeffe55678f2afc734765a08141e52e4
Parents: 3698892
Author: Igor Fedorenko <[email protected]>
Authored: Tue Nov 25 16:38:30 2014 -0500
Committer: Igor Fedorenko <[email protected]>
Committed: Tue Nov 25 19:11:01 2014 -0500

----------------------------------------------------------------------
 .../maven/model/validation/DefaultModelValidator.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/8788c90a/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 6b2a98d..1ca75e8 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
@@ -559,8 +559,7 @@ public class DefaultModelValidator
             validateStringNotEmpty( prefix + "type", problems, Severity.ERROR, 
Version.BASE, d.getType(),
                                     d.getManagementKey(), d );
 
-            validateStringNotEmpty( prefix + "version", problems, 
Severity.ERROR, Version.BASE, d.getVersion(),
-                                    d.getManagementKey(), d );
+            validateDependencyVersion( problems, d, prefix );
         }
 
         if ( "system".equals( d.getScope() ) )
@@ -626,6 +625,15 @@ public class DefaultModelValidator
         }
     }
 
+    /**
+     * @since 3.2.4 
+     */
+    protected void validateDependencyVersion( ModelProblemCollector problems, 
Dependency d, String prefix )
+    {
+        validateStringNotEmpty( prefix + "version", problems, Severity.ERROR, 
Version.BASE, d.getVersion(),
+                                d.getManagementKey(), d );
+    }
+
     private void validateRawRepositories( ModelProblemCollector problems, 
List<Repository> repositories, String prefix,
                                        ModelBuildingRequest request )
     {

Reply via email to