[MNG-8118] Merge BOM exclusions instead of overwriting (#1504)

apache · May 13, 2024 · 0564480 · 0564480
1 parent ba52bfe
commit 0564480
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1812,14 +1812,20 @@ private DependencyManagement loadDependencyManagement(
             // Dependency excluded from import.
             List<org.apache.maven.api.model.Dependency> dependencies = importMgmt.getDependencies().stream()
                     .filter(candidate -> exclusions.stream().noneMatch(exclusion -> match(exclusion, candidate)))
-                    .map(candidate -> candidate.withExclusions(exclusions))
+                    .map(candidate -> addExclusions(candidate, exclusions))
                     .collect(Collectors.toList());
             importMgmt = importMgmt.withDependencies(dependencies);
         }
 
         return importMgmt != null ? new DependencyManagement(importMgmt) : null;
     }
 
+    private static org.apache.maven.api.model.Dependency addExclusions(
+            org.apache.maven.api.model.Dependency candidate, List<Exclusion> exclusions) {
+        return candidate.withExclusions(Stream.concat(candidate.getExclusions().stream(), exclusions.stream())
+                .toList());
+    }
+
     private boolean match(Exclusion exclusion, org.apache.maven.api.model.Dependency candidate) {
         return match(exclusion.getGroupId(), candidate.getGroupId())
                 && match(exclusion.getArtifactId(), candidate.getArtifactId());