Merge pull request #25 from jamezp/filter-exclusions

[23] Add an ignored exclusions parameter for ignoring exclusions of i…
wildfly · Jan 9, 2024 · 5808ac0 · 5808ac0
2 parents 125fc78 + 26e1bf2
commit 5808ac0
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/main/java/org/wildfly/plugins/bombuilder/BuildBomMojo.java b/src/main/java/org/wildfly/plugins/bombuilder/BuildBomMojo.java
@@ -182,6 +182,12 @@ public class BuildBomMojo
     @Parameter
     private boolean bomWithDependencies = false;
 
+    /**
+     * A list of exclusions which should be ignored when defining the exclusions for included dependencies.
+     */
+    @Parameter(alias = "ignored-exclusions")
+    private List<Exclusion> ignoredExclusions;
+
     public enum InheritExclusions {
         ALL,
         NONE,
@@ -473,7 +479,9 @@ private void addDependencyManagement(Model pomModel) throws MojoExecutionExcepti
                 Exclusion exclusion = new Exclusion();
                 exclusion.setGroupId(excludedDependency.getGroupId());
                 exclusion.setArtifactId(excludedDependency.getArtifactId());
-                dependenciesExcludedFromResolving.add(exclusion);
+                if (!isIgnoredExclusion(exclusion)) {
+                    dependenciesExcludedFromResolving.add(exclusion);
+                }
             }
         }
         // include transitives of dependencies
@@ -601,7 +609,7 @@ public boolean accept(DependencyNode node, List<DependencyNode> parents) {
                         final List<Exclusion> filteredExclusions = new ArrayList<>();
                         for (Map.Entry<String, Exclusion> resolvedExclusionEntry : resolvedExclusions.entrySet()) {
                             final String resolvedExclusionKey = resolvedExclusionEntry.getKey();
-                            if (managedExclusions.contains(resolvedExclusionKey)) {
+                            if (managedExclusions.contains(resolvedExclusionKey) || isIgnoredExclusion(resolvedExclusionEntry.getValue())) {
                                 getLog().debug("Removing exclusion "+resolvedExclusionKey+" from dependency "+dependency.getManagementKey());
                                 continue;
                             }
@@ -831,6 +839,16 @@ private boolean isImportedDependency(Dependency dependency) {
         return false;
     }
 
+    private boolean isIgnoredExclusion(final Exclusion exclusion) {
+        for (Exclusion ignoredExclusion : ignoredExclusions) {
+            if (ignoredExclusion.getArtifactId().equals(exclusion.getArtifactId()) &&
+                    ignoredExclusion.getGroupId().equals(exclusion.getGroupId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private <T extends Dependency> T getDependencyMatch(Dependency dependency, Collection<? extends T> dependencyMatches) {
         if (dependencyMatches != null && !dependencyMatches.isEmpty()) {
             for (T dependencyMatch : dependencyMatches) {