(maven) 01/01: Filter transitive dependencies with uninterpolated expressions

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch filter-transitive-uninterpolated-deps
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 9ec2f1fafec801cbd0045df2a72fdba9099001cf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon May 18 21:56:50 2026 +0200

    Filter transitive dependencies with uninterpolated expressions
    
    When a transitive dependency POM contains dependencies with
    uninterpolated property expressions (e.g., ${osgi.version}), the
    MavenValidator.validateDependency() throws IllegalArgumentException
    during dependency collection.
    
    Filter out such dependencies in DefaultArtifactDescriptorReader
    .populateResult() before they reach the resolver/validator, following
    the same pattern used for transitive repositories with uninterpolated
    IDs/URLs (commit 9332ad3d55).
    
    This is safe because invalid dependencies from build POMs have already
    been rejected during model validation. Uninterpolated expressions in
    transitive dependency POMs indicate undefined properties in those
    third-party POMs that cannot be resolved.
    
    Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
---
 .../impl/resolver/DefaultArtifactDescriptorReader.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java
index 4d0b65c594..e584a0682a 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/DefaultArtifactDescriptorReader.java
@@ -350,12 +350,20 @@ private void populateResult(InternalSession session, ArtifactDescriptorResult re
         }
 
         for (org.apache.maven.api.model.Dependency dependency : model.getDependencies()) {
+            if (hasUninterpolatedExpression(dependency)) {
+                logger.debug("Filtered dependency with uninterpolated expression: {}", dependency);
+                continue;
+            }
             result.addDependency(convert(dependency, stereotypes));
         }
 
         DependencyManagement dependencyManagement = model.getDependencyManagement();
         if (dependencyManagement != null) {
             for (org.apache.maven.api.model.Dependency dependency : dependencyManagement.getDependencies()) {
+                if (hasUninterpolatedExpression(dependency)) {
+                    logger.debug("Filtered managed dependency with uninterpolated expression: {}", dependency);
+                    continue;
+                }
                 result.addManagedDependency(convert(dependency, stereotypes));
             }
         }
@@ -422,6 +430,16 @@ private Exclusion convert(org.apache.maven.api.model.Exclusion exclusion) {
         return new Exclusion(exclusion.getGroupId(), exclusion.getArtifactId(), "*", "*");
     }
 
+    private static boolean hasUninterpolatedExpression(org.apache.maven.api.model.Dependency dependency) {
+        return containsPlaceholder(dependency.getGroupId())
+                || containsPlaceholder(dependency.getArtifactId())
+                || containsPlaceholder(dependency.getVersion());
+    }
+
+    private static boolean containsPlaceholder(String value) {
+        return value != null && value.contains("${");
+    }
+
     private void setArtifactProperties(ArtifactDescriptorResult result, Model model) {
         DistributionManagement distributionManagement = model.getDistributionManagement();
         if (distributionManagement != null) {