You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/12/30 20:01:47 UTC
maven git commit: Polished code.
Repository: maven
Updated Branches:
refs/heads/MNG-6305-validation-of-ci-friendly 8fcd17bc6 -> 71f686fa3
Polished code.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/71f686fa
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/71f686fa
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/71f686fa
Branch: refs/heads/MNG-6305-validation-of-ci-friendly
Commit: 71f686fa30fcdbc01cf62ea414830dae97f8da02
Parents: 8fcd17b
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sat Dec 30 21:00:53 2017 +0100
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sat Dec 30 21:00:53 2017 +0100
----------------------------------------------------------------------
.../maven/model/validation/DefaultModelValidator.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/71f686fa/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 da4ba07..9299b43 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
@@ -68,6 +68,11 @@ public class DefaultModelValidator
private static final Pattern CI_FRIENDLY_EXPRESSION = Pattern.compile( "\\$\\{(.+?)\\}" );
+ private static final List<String> CI_FRIENDLY_POSSIBLE_PROPERTY_NAMES =
+ Arrays.asList( AbstractStringBasedModelInterpolator.REVISION_PROPERTY,
+ AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY,
+ AbstractStringBasedModelInterpolator.SHA1_PROPERTY );
+
private static final Pattern ID_REGEX = Pattern.compile( "[A-Za-z0-9_\\-.]+" );
private static final Pattern ID_WITH_WILDCARDS_REGEX = Pattern.compile( "[A-Za-z0-9_\\-.?*]+" );
@@ -870,13 +875,10 @@ public class DefaultModelValidator
// revision
// sha1
//
- List<String> ciVersions = Arrays.asList( AbstractStringBasedModelInterpolator.REVISION_PROPERTY,
- AbstractStringBasedModelInterpolator.CHANGELIST_PROPERTY,
- AbstractStringBasedModelInterpolator.SHA1_PROPERTY );
Matcher m = CI_FRIENDLY_EXPRESSION.matcher( string.trim() );
while ( m.find() )
{
- if ( !ciVersions.contains( m.group( 1 ) ) )
+ if ( !CI_FRIENDLY_POSSIBLE_PROPERTY_NAMES.contains( m.group( 1 ) ) )
{
addViolation( problems, severity, version, fieldName, null,
"contains an expression but should be a constant.", tracker );