This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch feature/dependency-id-attribute in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2fd1b9886d5a1830db650902764d151cec9e2d28 Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 08:50:36 2026 +0200 Clean up review findings in DependencyIdStrategy and DefaultModelValidator - Remove redundant model version guard in DependencyIdStrategy (the second check alone suffices) - Simplify redundant type removal branches in collapseDependency() - Remove redundant validateExclusionIdAttribute call from effective model validation (id is already cleared by normalizer before effective validation) Co-Authored-By: Claude Opus 4.6 <[email protected]> --- .../maven/cling/invoker/mvnup/goals/DependencyIdStrategy.java | 6 ------ .../java/org/apache/maven/impl/model/DefaultModelValidator.java | 1 - 2 files changed, 7 deletions(-) diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DependencyIdStrategy.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DependencyIdStrategy.java index 5efccfaec3..0182712c2e 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DependencyIdStrategy.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DependencyIdStrategy.java @@ -118,10 +118,6 @@ protected UpgradeResult doApply(UpgradeContext context, Map<Path, Document> pomM context.indent(); try { - if (!MODEL_VERSION_4_2_0.equals(currentVersion) && !ModelVersionUtils.isNewerThan410(currentVersion)) { - context.success("Skipping (model version " + currentVersion + " < 4.2.0)"); - continue; - } if (!MODEL_VERSION_4_2_0.equals(currentVersion)) { context.success("Skipping (model version " + currentVersion + " is not 4.2.0)"); continue; @@ -232,8 +228,6 @@ private boolean collapseDependency(UpgradeContext context, Element dependency) { if (classifier != null) { removeChildElement(dependency, CLASSIFIER); removeChildElement(dependency, TYPE); - } else if (type != null && !DEFAULT_TYPE.equals(type)) { - removeChildElement(dependency, TYPE); } else if (type != null) { removeChildElement(dependency, TYPE); } diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java index 4c91a6d9d7..9d479de55f 100644 --- a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java +++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelValidator.java @@ -1736,7 +1736,6 @@ private void validateEffectiveDependency( if (validationLevel >= ModelValidator.VALIDATION_LEVEL_MAVEN_2_0) { for (Exclusion exclusion : dependency.getExclusions()) { - validateExclusionIdAttribute(problems, exclusion, prefix); if (validationLevel < ModelValidator.VALIDATION_LEVEL_MAVEN_3_0) { validateCoordinatesId( prefix,
