From bf7f47b4f8639aae030181f30f99762013494a60 Mon Sep 17 00:00:00 2001
From: Tim te Beek <tim@moderne.io>
Date: Tue, 3 Sep 2024 10:51:08 +0200
Subject: [PATCH] Also exclude omitted dependencies

---
 .../maven/ExcludeDependencyTest.java          | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java
index fd741445aba..4008b55c826 100644
--- a/rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java
+++ b/rewrite-maven/src/test/java/org/openrewrite/maven/ExcludeDependencyTest.java
@@ -18,6 +18,7 @@
 import org.junit.jupiter.api.Test;
 import org.openrewrite.DocumentExample;
 import org.openrewrite.Issue;
+import org.openrewrite.java.JavaParser;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
@@ -234,4 +235,68 @@ void respectTransitiveDependencyOriginalScopeWhenDeterminingIfExclusionIsNecessa
           """)
         );
     }
+
+    @Test
+    void excludeAlsoWhereConflictOmitted() {
+        rewriteRun(
+          spec -> spec
+            .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>
+              """
+          )
+        );
+    }
 }