You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2015/04/01 02:23:53 UTC
[11/50] [abbrv] maven git commit: MNG-5734: Fail,
rather than just warning, on empty '' entries.
MNG-5734: Fail, rather than just warning, on empty '<module>' entries.
An incorrect non-blank module is currently treated as an error. Behave
the same way for a blank module, rather than simply warning about
the mistake.
Signed-off-by: Jason van Zyl <ja...@tesla.io>
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b8dcb087
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b8dcb087
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b8dcb087
Branch: refs/heads/slf4j-log4j2
Commit: b8dcb08731ce7e43399320ce7c7579c4a24481c9
Parents: fdcd34d
Author: Joseph Walton <jo...@kafsemo.org>
Authored: Sat Feb 21 17:33:01 2015 +1100
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Sat Feb 21 09:22:27 2015 -0500
----------------------------------------------------------------------
.../org/apache/maven/model/validation/DefaultModelValidator.java | 2 +-
.../apache/maven/model/validation/DefaultModelValidatorTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b8dcb087/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 def9c13..dd7bd4e 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
@@ -312,7 +312,7 @@ public class DefaultModelValidator
String module = m.getModules().get( i );
if ( StringUtils.isBlank( module ) )
{
- addViolation( problems, Severity.WARNING, Version.BASE, "modules.module[" + i + "]", null,
+ addViolation( problems, Severity.ERROR, Version.BASE, "modules.module[" + i + "]", null,
"has been specified without a path to the project directory.",
m.getLocation( "modules" ) );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/b8dcb087/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 791a318..dde532d 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -430,9 +430,9 @@ public class DefaultModelValidatorTest
{
SimpleProblemCollector result = validate( "empty-module.xml" );
- assertViolations( result, 0, 0, 1 );
+ assertViolations( result, 0, 1, 0 );
- assertTrue( result.getWarnings().get( 0 ).contains( "'modules.module[0]' has been specified without a path" ) );
+ assertTrue( result.getErrors().get( 0 ).contains( "'modules.module[0]' has been specified without a path" ) );
}
public void testDuplicatePlugin()