Also exclude omitted dependencies

rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependencyVisitor.java

@@ -199,7 +199,7 @@ static G.CompilationUnit addDependency(
                                 }
                                 return resolved;
                             }),
-                            new ResolvedDependency(null, resolvedGav, newRequested, transitiveDependencies,
+                            new ResolvedDependency(null, resolvedGav, newRequested, transitiveDependencies, emptyList(),
                                     emptyList(), "jar", classifier, null, 0, null)));
                 }
                 newNameToConfiguration.put(newGdc.getName(), newGdc);

rewrite-maven/src/main/java/org/openrewrite/maven/ExcludeDependency.java

@@ -99,7 +99,8 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 ResolvedDependency dependency = findDependency(tag, scope);
                 if (dependency != null &&
                     !(matchesGlob(dependency.getGroupId(), groupId) && matchesGlob(dependency.getArtifactId(), artifactId)) &&
-                    dependency.findDependency(groupId, artifactId) != null) {
+                    dependency.findDependencyWithOmit(groupId, artifactId) != null) {
+                    boolean needUpdate = false;
                     Optional<Xml.Tag> maybeExclusions = tag.getChild("exclusions");
                     if (maybeExclusions.isPresent()) {
                         Xml.Tag exclusions = maybeExclusions.get();
@@ -116,6 +117,7 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                                                   "</exclusion>"))
                                     .visitNonNull(exclusions, ctx, getCursor());
                             tag = tag.withContent(ListUtils.map((List<Content>) tag.getContent(), t -> t == exclusions ? newExclusions : t));
+                            needUpdate = true;
                         }
                     } else {
                         tag = (Xml.Tag) new AddToTagVisitor<>(tag,
@@ -127,8 +129,11 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
                                               "</exclusion>\n" +
                                               "</exclusions>"))
                                 .visitNonNull(tag, ctx, getCursor().getParentOrThrow());
+                        needUpdate = true;
+                    }
+                    if (needUpdate) {
+                        maybeUpdateModel();
                     }
-                    maybeUpdateModel();
                 }
                 return tag;
             }

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedDependency.java

@@ -52,6 +52,10 @@ public class ResolvedDependency implements Serializable {
     @EqualsAndHashCode.Exclude
     List<ResolvedDependency> dependencies;
 
+    @NonFinal
+    @EqualsAndHashCode.Exclude
+    List<GroupArtifactVersion> omitDependencies;
+
     List<License> licenses;
 
     @Nullable
@@ -81,6 +85,10 @@ void unsafeSetDependencies(List<ResolvedDependency> dependencies) {
         this.dependencies = dependencies;
     }
 
+    void unsafeSetOmitDependencies(List<GroupArtifactVersion> omitDependencies) {
+        this.omitDependencies = omitDependencies;
+    }
+
     void unsafeSetEffectiveExclusions(List<GroupArtifact> effectiveExclusions) {
         this.effectiveExclusions = effectiveExclusions;
     }
@@ -142,6 +150,40 @@ public boolean isTransitive() {
         return null;
     }
 
+    public @Nullable ResolvedDependency findDependencyWithOmit(String groupId, String artifactId) {
+        return findDependencyWithOmit0(groupId, artifactId, Collections.newSetFromMap(new IdentityHashMap<>()));
+    }
+
+    private @Nullable ResolvedDependency findDependencyWithOmit0(String groupId, String artifactId, Set<ResolvedDependency> visited) {
+        if (matchesGlob(getGroupId(), groupId) && matchesGlob(getArtifactId(), artifactId)) {
+            return this;
+        } else if (!visited.add(this)) {
+            return null;
+        }
+        outer:
+        for (ResolvedDependency dependency : dependencies) {
+            ResolvedDependency found = dependency.findDependencyWithOmit0(groupId, artifactId, visited);
+            if (found != null) {
+                if (getRequested().getExclusions() != null) {
+                    for (GroupArtifact exclusion : getRequested().getExclusions()) {
+                        if (matchesGlob(found.getGroupId(), exclusion.getGroupId()) &&
+                                matchesGlob(found.getArtifactId(), exclusion.getArtifactId())) {
+                            continue outer;
+                        }
+                    }
+                }
+                return found;
+            }
+        }
+
+        for (GroupArtifactVersion omit : omitDependencies) {
+            if (matchesGlob(omit.getGroupId(), groupId) && matchesGlob(omit.getArtifactId(), artifactId)) {
+                return this;
+            }
+        }
+        return null;
+    }
+
     @Override
     public String toString() {
         return (repository == null ? "" : repository.getUri() + "/") +

rewrite-maven/src/main/java/org/openrewrite/maven/tree/ResolvedPom.java

@@ -916,6 +916,13 @@ public List<ResolvedDependency> resolveDependencies(Scope scope, Map<GroupArtifa
                         } else if (contains(dependencies, ga, d.getClassifier())) {
                             // we've already resolved this previously and the requirement didn't change,
                             // so just skip and continue on
+                            ResolvedDependency includedBy = dd.getDependent();
+                            if (includedBy != null) {
+                                if (includedBy.getOmitDependencies().isEmpty()) {
+                                    includedBy.unsafeSetOmitDependencies(new ArrayList<>());
+                                }
+                                includedBy.getOmitDependencies().add(new GroupArtifactVersion(d.getGroupId(), d.getArtifactId(), d.getVersion()));
+                            }
                             continue;
                         }
                     }
@@ -938,7 +945,7 @@ public List<ResolvedDependency> resolveDependencies(Scope scope, Map<GroupArtifa
                     }
 
                     ResolvedDependency resolved = new ResolvedDependency(dPom.getRepository(),
-                            resolvedPom.getGav(), dd.getDependency(), emptyList(),
+                            resolvedPom.getGav(), dd.getDependency(), emptyList(), emptyList(),
                             resolvedPom.getRequested().getLicenses(),
                             resolvedPom.getValue(dd.getDependency().getType()),
                             resolvedPom.getValue(dd.getDependency().getClassifier()),

rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java

@@ -20,6 +20,7 @@
 import org.openrewrite.Issue;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
 
 import static org.openrewrite.maven.Assertions.pomXml;
 
@@ -234,4 +235,68 @@ void respectTransitiveDependencyOriginalScopeWhenDeterminingIfExclusionIsNecessa
           """)
         );
     }
+
+    @Test
+    void excludeAlsoWhereConflictOmitted() {
+        rewriteRun(
+          spec -> spec.typeValidationOptions(TypeValidation.none()).afterTypeValidationOptions(TypeValidation.none())
+            .recipe(new ExcludeDependency("org.apache.logging.log4j", "log4j-api", null)),
+          pomXml(
+            """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter</artifactId>
+                    <version>2.7.18</version>
+                  </dependency>
+                  <dependency>
+                    <!-- (org.apache.logging.log4j:log4j-api:jar:2.20.0:compile - omitted for conflict with 2.17.2) -->
+                    <groupId>org.opensearch.client</groupId>
+                    <artifactId>spring-data-opensearch-starter</artifactId>
+                    <version>1.3.0</version>
+                  </dependency>
+                </dependencies>
+              </project>
+              """,
+            """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>com.example</groupId>
+                <artifactId>demo</artifactId>
+                <version>0.0.1-SNAPSHOT</version>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter</artifactId>
+                    <version>2.7.18</version>
+                    <exclusions>
+                      <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-api</artifactId>
+                      </exclusion>
+                    </exclusions>
+                  </dependency>
+                  <dependency>
+                    <!-- (org.apache.logging.log4j:log4j-api:jar:2.20.0:compile - omitted for conflict with 2.17.2) -->
+                    <groupId>org.opensearch.client</groupId>
+                    <artifactId>spring-data-opensearch-starter</artifactId>
+                    <version>1.3.0</version>
+                    <exclusions>
+                      <exclusion>
+                        <groupId>org.apache.logging.log4j</groupId>
+                        <artifactId>log4j-api</artifactId>
+                      </exclusion>
+                    </exclusions>
+                  </dependency>
+                </dependencies>
+              </project>
+              """
+          )
+        );
+    }
 }