Resolve Maven property references when matching dependency tags (#7351)

Fixes #4796 — `RemoveDependency` (and other recipes using `isDependencyTag`
or `findDependency`) failed to match dependencies whose groupId or
artifactId was defined via a Maven property (e.g. `${junit.groupId}`).

The root cause was that `isDependencyTag` and `findDependency` in
`MavenVisitor` compared raw XML tag values against resolved dependency
coordinates without first resolving property placeholders. Now both
methods use `ResolvedPom.getValue()` to expand properties before
comparing.

Author: timtebeek

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

@@ -146,9 +146,13 @@ public boolean isDependencyTag(String groupId, String artifactId) {
                             }
                         }
                         Dependency req = resolvedDependency.getRequested();
-                        String reqGroup = req.getGroupId();
-                        if ((reqGroup == null || reqGroup.equals(tag.getChildValue("groupId").orElse(null))) &&
-                                req.getArtifactId().equals(tag.getChildValue("artifactId").orElse(null)) &&
+                        ResolvedPom pom = getResolutionResult().getPom();
+                        String reqGroup = pom.getValue(req.getGroupId());
+                        String reqArtifact = pom.getValue(req.getArtifactId());
+                        String tagGroupId = pom.getValue(tag.getChildValue("groupId").orElse(null));
+                        String tagArtifactId = pom.getValue(tag.getChildValue("artifactId").orElse(null));
+                        if ((reqGroup == null || reqGroup.equals(tagGroupId)) &&
+                                reqArtifact.equals(tagArtifactId) &&
                                 scope == tagScope) {
                             return true;
                         }
@@ -413,11 +417,14 @@ protected boolean isProperty(@Nullable String value) {
         if (inClasspathOf != null && tagScope != inClasspathOf && !tagScope.isInClasspathOf(inClasspathOf)) {
             return null;
         }
+        ResolvedPom resolvedPom = getResolutionResult().getPom();
         for (Map.Entry<Scope, List<ResolvedDependency>> scope : getResolutionResult().getDependencies().entrySet()) {
             if (inClasspathOf == null || scope.getKey() == inClasspathOf || scope.getKey().isInClasspathOf(inClasspathOf)) {
                 for (ResolvedDependency d : scope.getValue()) {
-                    if (tag.getChildValue("groupId").orElse(getResolutionResult().getPom().getGroupId()).equals(d.getGroupId()) &&
-                            tag.getChildValue("artifactId").orElse(getResolutionResult().getPom().getArtifactId()).equals(d.getArtifactId())) {
+                    String tagGroupId = resolvedPom.getValue(tag.getChildValue("groupId").orElse(null));
+                    String tagArtifactId = resolvedPom.getValue(tag.getChildValue("artifactId").orElse(null));
+                    if ((tagGroupId != null ? tagGroupId : resolvedPom.getGroupId()).equals(d.getGroupId()) &&
+                            (tagArtifactId != null ? tagArtifactId : resolvedPom.getArtifactId()).equals(d.getArtifactId())) {
                         return d;
                     }
                 }

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

@@ -312,4 +312,62 @@ void removeDependencyWithTypeZip() {
           )
         );
     }
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/4796")
+    void removeDependencyDefinedWithProperties() {
+        rewriteRun(
+          spec -> spec.recipe(new RemoveDependency("junit", "junit", null)),
+          pomXml(
+            """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+
+                <properties>
+                  <junit.groupId>junit</junit.groupId>
+                </properties>
+
+                <dependencies>
+                  <dependency>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                    <version>29.0-jre</version>
+                  </dependency>
+                  <dependency>
+                    <groupId>${junit.groupId}</groupId>
+                    <artifactId>junit</artifactId>
+                    <version>4.13.1</version>
+                    <scope>test</scope>
+                  </dependency>
+                </dependencies>
+              </project>
+              """,
+            """
+              <project>
+                <modelVersion>4.0.0</modelVersion>
+
+                <groupId>com.mycompany.app</groupId>
+                <artifactId>my-app</artifactId>
+                <version>1</version>
+
+                <properties>
+                  <junit.groupId>junit</junit.groupId>
+                </properties>
+
+                <dependencies>
+                  <dependency>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                    <version>29.0-jre</version>
+                  </dependency>
+                </dependencies>
+              </project>
+              """
+          )
+        );
+    }
 }