RemoveManagedDependency can now remove bom imports

openrewrite · Feb 14, 2024 · ababd3e · ababd3e
1 parent 0c67bf2
commit ababd3e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveManagedDependency.java b/rewrite-maven/src/main/java/org/openrewrite/maven/RemoveManagedDependency.java
@@ -78,8 +78,8 @@ private class RemoveManagedDependencyVisitor extends MavenIsoVisitor<ExecutionCo
         public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
             if (isManagedDependencyTag(groupId, artifactId)) {
                 Scope checkScope = scope != null ? Scope.fromName(scope) : null;
-                ResolvedManagedDependency managedDependency = findManagedDependency(tag, checkScope);
-                if (managedDependency != null) {
+                boolean isBomImport = tag.getChildValue("scope").map("import"::equalsIgnoreCase).orElse(false);
+                if (isBomImport || findManagedDependency(tag, checkScope) != null) {
                     doAfterVisit(new RemoveContentVisitor<>(tag, true));
                     maybeUpdateModel();
                 }

diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/RemoveManagedDependencyTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/RemoveManagedDependencyTest.java
@@ -217,4 +217,44 @@ void removeManagedDependencyWithScopeNonMatching() {
           )
         );
     }
+
+    @Test
+    void removeBomImport() {
+        rewriteRun(
+          spec -> spec.recipe(new RemoveManagedDependency(
+            "io.micrometer",
+            "micrometer-bom",
+            null
+          )),
+          pomXml(
+            """
+              <project>
+                  <modelVersion>4.0.0</modelVersion>
+                  <groupId>com.mycompany.app</groupId>
+                  <artifactId>my-app</artifactId>
+                  <version>1</version>
+                  <dependencyManagement>
+                      <dependencies>
+                          <dependency>
+                              <groupId>io.micrometer</groupId>
+                              <artifactId>micrometer-bom</artifactId>
+                              <version>1.9.9</version>
+                              <scope>import</scope>
+                              <type>bom</type>
+                          </dependency>
+                      </dependencies>
+                  </dependencyManagement>
+              </project>
+              """,
+            """
+              <project>
+                  <modelVersion>4.0.0</modelVersion>
+                  <groupId>com.mycompany.app</groupId>
+                  <artifactId>my-app</artifactId>
+                  <version>1</version>
+              </project>
+              """
+          )
+        );
+    }
 }