Maven multi modules resources not handled correctly (#1067)

* Maven multi modules resources not handled correctly

* Update assertions

* Adopt suggested alternative

* Update src/test/java/org/openrewrite/maven/RewriteRunIT.java

Co-authored-by: Shannon Pamperl <[email protected]>

* Fix compilation and assertion after applied suggestion

---------

Co-authored-by: Shannon Pamperl <[email protected]>

Author: timtebeek

src/main/java/org/openrewrite/maven/MavenMojoProjectParser.java

@@ -926,10 +926,13 @@ private OmniParser omniParser(Set<Path> alreadyParsed, MavenProject mavenProject
     }
 
     private Collection<String> mergeExclusions(MavenProject mavenProject) {
+        Path projectPath = mavenProject.getBasedir().toPath();
         return Stream.concat(
                 pathsToOtherMavenProjects(mavenProject).stream()
-                        .map(subproject -> separatorsToUnix(baseDir.relativize(mavenProject.getBasedir().toPath()).toString())),
-                exclusions.stream()).collect(toList());
+                        .filter(otherProjectPath -> !projectPath.startsWith(otherProjectPath))
+                        .map(subproject -> separatorsToUnix(baseDir.relativize(subproject).toString())),
+                exclusions.stream()
+        ).collect(toList());
     }
 
     private Collection<PathMatcher> pathMatchers(Path basePath, Collection<String> pathExpressions) {

src/test/java/org/openrewrite/maven/RewriteRunIT.java

@@ -28,7 +28,6 @@
 import java.util.stream.Stream;
 
 import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.openrewrite.PathUtils.separatorsToSystem;
 
 @MavenGoal("${project.groupId}:${project.artifactId}:${project.version}:run")
@@ -47,6 +46,16 @@ void multi_module_project(MavenExecutionResult result) {
           .anySatisfy(line -> assertThat(line).contains("org.openrewrite.staticanalysis.SimplifyBooleanExpression"));
     }
 
+    @MavenTest
+    void multi_module_resources(MavenExecutionResult result) {
+        assertThat(result)
+          .isSuccessful()
+          .out()
+          .warn()
+          .contains("Changes have been made to %s by:".formatted(separatorsToSystem("project/a/src/main/resources/example.xml")))
+          .contains("    org.openrewrite.xml.ChangeTagName: {elementName=/foo, newName=bar}");
+    }
+
     @MavenGoal("generate-test-sources")
     @MavenTest
     @SystemProperties({

src/test/resources-its/org/openrewrite/maven/RewriteRunIT/multi_module_resources/a/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.openrewrite.maven</groupId>
+        <artifactId>multi_module_resources</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>a</artifactId>
+
+</project>

src/test/resources-its/org/openrewrite/maven/RewriteRunIT/multi_module_resources/a/src/main/resources/example.xml

@@ -0,0 +1 @@
+<foo>bar</foo>

src/test/resources-its/org/openrewrite/maven/RewriteRunIT/multi_module_resources/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.openrewrite.maven</groupId>
+    <artifactId>multi_module_resources</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>a</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>@project.groupId@</groupId>
+                <artifactId>@project.artifactId@</artifactId>
+                <version>@project.version@</version>
+                <configuration>
+                    <activeRecipes>
+                        <recipe>bug.report.ChangeTag</recipe>
+                    </activeRecipes>
+                    <configLocation>
+                        ${maven.multiModuleProjectDirectory}/src/test/resources-its/org/openrewrite/maven/RewriteRunIT/multi_module_resources/rewrite.yml
+                    </configLocation>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-static-analysis</artifactId>
+                        <version>1.0.4</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/test/resources-its/org/openrewrite/maven/RewriteRunIT/multi_module_resources/rewrite.yml

@@ -0,0 +1,8 @@
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: bug.report.ChangeTag
+displayName: Change XML tag name
+recipeList:
+  - org.openrewrite.xml.ChangeTagName:
+      elementName: /foo
+      newName: bar