Skip to content

Commit 7ced2ce

Browse files
committed
Remove unused method
# Conflicts: # maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java
1 parent 7a50bb3 commit 7ced2ce

File tree

1 file changed

+1
-32
lines changed

1 file changed

+1
-32
lines changed

maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ public void validateFileModel(
426426
validateStringNoExpression("artifactId", problems, Severity.WARNING, Version.V20, m.getArtifactId(), m);
427427
validateStringNotEmpty("artifactId", problems, Severity.FATAL, Version.V20, m.getArtifactId(), m);
428428

429-
validateVersionNoExpression("version", problems, Severity.WARNING, Version.V20, m.getVersion(), m);
429+
validateStringNoExpression("version", problems, Severity.WARNING, Version.V20, m.getVersion(), m);
430430
if (parent == null) {
431431
validateStringNotEmpty("version", problems, Severity.FATAL, Version.V20, m.getVersion(), m);
432432
}
@@ -1621,37 +1621,6 @@ private boolean validateStringNoExpression(
16211621
return false;
16221622
}
16231623

1624-
private boolean validateVersionNoExpression(
1625-
String fieldName,
1626-
ModelProblemCollector problems,
1627-
Severity severity,
1628-
Version version,
1629-
String string,
1630-
InputLocationTracker tracker) {
1631-
if (!hasExpression(string)) {
1632-
return true;
1633-
}
1634-
1635-
Matcher m = EXPRESSION_NAME_PATTERN.matcher(string.trim());
1636-
while (m.find()) {
1637-
String property = m.group(1);
1638-
if (!versionProcessor.isValidProperty(property)) {
1639-
addViolation(
1640-
problems,
1641-
severity,
1642-
version,
1643-
fieldName,
1644-
null,
1645-
"contains an expression but should be a constant.",
1646-
tracker);
1647-
1648-
return false;
1649-
}
1650-
}
1651-
1652-
return true;
1653-
}
1654-
16551624
private boolean hasExpression(String value) {
16561625
return value != null && value.contains("${");
16571626
}

0 commit comments

Comments
 (0)