Fix Source.targetPath incorrectly aligned to basedir (PR #12206)

Cherry-pick from fix/resource-targetpath-compat branch.
Supersedes earlier #12178 cherry-pick with expanded fix.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: gnodet

impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java

@@ -45,15 +45,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.apache.maven.project.ProjectBuildingResultWithLocationMatcher.projectBuildingResultWithLocation;
-import static org.apache.maven.project.ProjectBuildingResultWithProblemMessageMatcher.projectBuildingResultWithProblemMessage;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.hasKey;
-import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -102,15 +93,17 @@ void testVersionlessManagedDependency() throws Exception {
         ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
         configuration.setRepositorySession(mavenSession.getRepositorySession());
 
-        ProjectBuildingException e = assertThrows(ProjectBuildingException.class, () -> getContainer()
-                .lookup(org.apache.maven.project.ProjectBuilder.class)
-                .build(pomFile, configuration));
-        assertThat(
-                e.getResults(),
-                contains(
-                        projectBuildingResultWithProblemMessage(
-                                "'dependencies.dependency.version' for groupId='org.apache.maven.its', artifactId='a', type='jar' is missing")));
-        assertThat(e.getResults(), contains(projectBuildingResultWithLocation(5, 9)));
+        ProjectBuildingException e = assertThrows(
+                ProjectBuildingException.class,
+                () -> getContainer()
+                        .lookup(org.apache.maven.project.ProjectBuilder.class)
+                        .build(pomFile, configuration));
+        assertEquals(1, e.getResults().size());
+        ProjectBuildingResultWithProblemMessageAssert.assertThat(e.getResults().get(0))
+                .hasProblemMessage(
+                        "'dependencies.dependency.version' for groupId='org.apache.maven.its', artifactId='a', type='jar' is missing");
+        ProjectBuildingResultWithLocationAssert.assertThat(e.getResults().get(0))
+                .hasLocation(5, 9);
     }
 
     @Test
@@ -194,7 +187,7 @@ void testReadModifiedPoms(@TempDir Path tempDir) throws Exception {
         Files.write(parent.toPath(), parentContent.getBytes(StandardCharsets.UTF_8));
         // re-build pom with modified parent
         ProjectBuildingResult result = projectBuilder.build(child, configuration);
-        assertThat(result.getProject().getProperties(), hasKey((Object) "addedProperty"));
+        assertTrue(result.getProject().getProperties().containsKey("addedProperty"));
     }
 
     @Test
@@ -242,19 +235,18 @@ void testReadInvalidPom() throws Exception {
 
         // single project build entry point
         Exception ex = assertThrows(Exception.class, () -> projectBuilder.build(pomFile, configuration));
-        assertThat(ex.getMessage(), containsString("Received non-all-whitespace CHARACTERS or CDATA event"));
+        assertTrue(ex.getMessage().contains("Received non-all-whitespace CHARACTERS or CDATA event"));
 
         // multi projects build entry point
         ProjectBuildingException pex = assertThrows(
                 ProjectBuildingException.class,
                 () -> projectBuilder.build(Collections.singletonList(pomFile), false, configuration));
         assertEquals(1, pex.getResults().size());
         assertNotNull(pex.getResults().get(0).getPomFile());
-        assertThat(pex.getResults().get(0).getProblems().size(), greaterThan(0));
-        assertThat(
-                pex.getResults(),
-                contains(projectBuildingResultWithProblemMessage(
-                        "Received non-all-whitespace CHARACTERS or CDATA event in nextTag()")));
+        assertTrue(pex.getResults().get(0).getProblems().size() > 0);
+        ProjectBuildingResultWithProblemMessageAssert.assertThat(
+                        pex.getResults().get(0))
+                .hasProblemMessage("Received non-all-whitespace CHARACTERS or CDATA event in nextTag()");
     }
 
     @Test
@@ -305,7 +297,7 @@ private MavenProject findChildProject(List<ProjectBuildingResult> results) {
 
     private void assertResultShowNoError(List<ProjectBuildingResult> results) {
         for (ProjectBuildingResult result : results) {
-            assertThat(result.getProblems(), is(empty()));
+            assertTrue(result.getProblems().isEmpty());
             assertNotNull(result.getProject());
         }
     }
@@ -653,10 +645,11 @@ void testNonModularResourcesOnlyWithImplicitJavaFallback() throws Exception {
         List<SourceRoot> mainResources = project.getEnabledSourceRoots(ProjectScope.MAIN, Language.RESOURCES)
                 .toList();
         assertTrue(
-                mainResources.stream().anyMatch(sr -> sr.directory()
-                        .toString()
-                        .replace(File.separatorChar, '/')
-                        .contains("src/main/custom-resources")),
+                mainResources.stream()
+                        .anyMatch(sr -> sr.directory()
+                                .toString()
+                                .replace(File.separatorChar, '/')
+                                .contains("src/main/custom-resources")),
                 "Should have custom main resources from <sources>");
 
         // Verify legacy Java directories are used as fallback
@@ -726,10 +719,11 @@ void testNonModularResourcesOnlyWithExplicitLegacyDirectoriesRejected() throws E
         List<SourceRoot> mainResources = project.getEnabledSourceRoots(ProjectScope.MAIN, Language.RESOURCES)
                 .toList();
         assertTrue(
-                mainResources.stream().anyMatch(sr -> sr.directory()
-                        .toString()
-                        .replace(File.separatorChar, '/')
-                        .contains("src/main/custom-resources")),
+                mainResources.stream()
+                        .anyMatch(sr -> sr.directory()
+                                .toString()
+                                .replace(File.separatorChar, '/')
+                                .contains("src/main/custom-resources")),
                 "Should have custom main resources from <sources>");
 
         // Verify NO Java source roots (legacy was rejected, none in <sources>)
@@ -900,14 +894,16 @@ void testMultipleDirectoriesSameModule() throws Exception {
         assertEquals(2, moduleCount, "Both main sources should be for com.example.app module");
 
         // One should be implicit directory, one should be generated-sources
-        boolean hasImplicitDir = mainJavaRoots.stream().anyMatch(sr -> sr.directory()
-                .toString()
-                .replace(File.separatorChar, '/')
-                .contains("src/com.example.app/main/java"));
-        boolean hasGeneratedDir = mainJavaRoots.stream().anyMatch(sr -> sr.directory()
-                .toString()
-                .replace(File.separatorChar, '/')
-                .contains("target/generated-sources/com.example.app/java"));
+        boolean hasImplicitDir = mainJavaRoots.stream()
+                .anyMatch(sr -> sr.directory()
+                        .toString()
+                        .replace(File.separatorChar, '/')
+                        .contains("src/com.example.app/main/java"));
+        boolean hasGeneratedDir = mainJavaRoots.stream()
+                .anyMatch(sr -> sr.directory()
+                        .toString()
+                        .replace(File.separatorChar, '/')
+                        .contains("target/generated-sources/com.example.app/java"));
 
         assertTrue(hasImplicitDir, "Should have implicit source directory for module");
         assertTrue(hasGeneratedDir, "Should have generated-sources directory for module");
@@ -1002,8 +998,8 @@ void testDuplicateEnabledSources() throws Exception {
     }
 
     @Test
-    void testSourceTargetPathRemainsRelative() throws Exception {
-        File pom = getProject("source-target-path");
+    void testResourceTargetPathRemainsRelativeInCompatLayer() throws Exception {
+        File pom = getProject("resource-target-path");
 
         MavenSession mavenSession = createMavenSession(null);
         ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
@@ -1015,34 +1011,51 @@ void testSourceTargetPathRemainsRelative() throws Exception {
 
         MavenProject project = result.getProject();
 
-        // Verify main resources have relative targetPath preserved
+        // Verify main resources via SourceRoot API
         List<SourceRoot> mainResources = project.getEnabledSourceRoots(ProjectScope.MAIN, Language.RESOURCES)
                 .toList();
         assertEquals(1, mainResources.size());
-        assertTrue(mainResources.get(0).targetPath().isPresent());
-        assertEquals(Path.of(".grammar"), mainResources.get(0).targetPath().get());
+        assertTrue(mainResources.get(0).targetPath().isPresent(), "Main resource should have a targetPath");
+        assertFalse(
+                mainResources.get(0).targetPath().get().isAbsolute(),
+                "SourceRoot targetPath must be relative, got: "
+                        + mainResources.get(0).targetPath().get());
+        assertEquals(
+                Path.of("META-INF/tags/rdc"), mainResources.get(0).targetPath().get());
 
-        // Verify test resources have relative targetPath preserved
+        // Verify test resources via SourceRoot API
         List<SourceRoot> testResources = project.getEnabledSourceRoots(ProjectScope.TEST, Language.RESOURCES)
                 .toList();
         assertEquals(1, testResources.size());
-        assertTrue(testResources.get(0).targetPath().isPresent());
-        assertEquals(Path.of("META-INF/test"), testResources.get(0).targetPath().get());
+        assertTrue(testResources.get(0).targetPath().isPresent(), "Test resource should have a targetPath");
+        assertFalse(
+                testResources.get(0).targetPath().get().isAbsolute(),
+                "SourceRoot targetPath must be relative, got: "
+                        + testResources.get(0).targetPath().get());
+        assertEquals(
+                Path.of("org/apache/maven/messages"),
+                testResources.get(0).targetPath().get());
 
-        // Verify the compat layer also returns relative targetPath
+        // Verify compat layer: MavenProject.getResources() must return relative targetPath
         List<org.apache.maven.model.Resource> resources = project.getResources();
         assertEquals(1, resources.size());
-        assertEquals(".grammar", resources.get(0).getTargetPath());
+        assertFalse(
+                Path.of(resources.get(0).getTargetPath()).isAbsolute(),
+                "Resource targetPath from getResources() must be relative, got: "
+                        + resources.get(0).getTargetPath());
 
+        // Verify compat layer: MavenProject.getTestResources() must return relative targetPath
         List<org.apache.maven.model.Resource> testResourceList = project.getTestResources();
         assertEquals(1, testResourceList.size());
-        assertEquals(
-                "META-INF" + File.separator + "test", testResourceList.get(0).getTargetPath());
+        assertFalse(
+                Path.of(testResourceList.get(0).getTargetPath()).isAbsolute(),
+                "Test resource targetPath from getTestResources() must be relative, got: "
+                        + testResourceList.get(0).getTargetPath());
     }
 
     @Test
-    void testResourceTargetPathRemainsRelativeInCompatLayer() throws Exception {
-        File pom = getProject("resource-target-path");
+    void testSourceTargetPathRemainsRelative() throws Exception {
+        File pom = getProject("source-target-path");
 
         MavenSession mavenSession = createMavenSession(null);
         ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest();
@@ -1054,45 +1067,28 @@ void testResourceTargetPathRemainsRelativeInCompatLayer() throws Exception {
 
         MavenProject project = result.getProject();
 
-        // Verify main resources via SourceRoot API
+        // Verify main resources have relative targetPath preserved
         List<SourceRoot> mainResources = project.getEnabledSourceRoots(ProjectScope.MAIN, Language.RESOURCES)
                 .toList();
         assertEquals(1, mainResources.size());
         assertTrue(mainResources.get(0).targetPath().isPresent());
-        assertFalse(
-                mainResources.get(0).targetPath().get().isAbsolute(),
-                "SourceRoot targetPath must be relative, got: "
-                        + mainResources.get(0).targetPath().get());
-        assertEquals(
-                Path.of("META-INF/tags/rdc"), mainResources.get(0).targetPath().get());
+        assertEquals(Path.of(".grammar"), mainResources.get(0).targetPath().get());
 
-        // Verify test resources via SourceRoot API
+        // Verify test resources have relative targetPath preserved
         List<SourceRoot> testResources = project.getEnabledSourceRoots(ProjectScope.TEST, Language.RESOURCES)
                 .toList();
         assertEquals(1, testResources.size());
         assertTrue(testResources.get(0).targetPath().isPresent());
-        assertFalse(
-                testResources.get(0).targetPath().get().isAbsolute(),
-                "SourceRoot targetPath must be relative, got: "
-                        + testResources.get(0).targetPath().get());
-        assertEquals(
-                Path.of("org/apache/maven/messages"),
-                testResources.get(0).targetPath().get());
+        assertEquals(Path.of("META-INF/test"), testResources.get(0).targetPath().get());
 
-        // Verify compat layer: MavenProject.getResources() must return relative targetPath
+        // Verify the compat layer also returns relative targetPath
         List<org.apache.maven.model.Resource> resources = project.getResources();
         assertEquals(1, resources.size());
-        assertEquals(
-                "META-INF" + File.separator + "tags" + File.separator + "rdc",
-                resources.get(0).getTargetPath(),
-                "Resource targetPath from getResources() must remain relative");
+        assertEquals(".grammar", resources.get(0).getTargetPath());
 
-        // Verify compat layer: MavenProject.getTestResources() must return relative targetPath
         List<org.apache.maven.model.Resource> testResourceList = project.getTestResources();
         assertEquals(1, testResourceList.size());
         assertEquals(
-                "org" + File.separator + "apache" + File.separator + "maven" + File.separator + "messages",
-                testResourceList.get(0).getTargetPath(),
-                "Test resource targetPath from getTestResources() must remain relative");
+                "META-INF" + File.separator + "test", testResourceList.get(0).getTargetPath());
     }
 }

impl/maven-core/src/test/projects/project-builder/resource-target-path/pom.xml

@@ -28,9 +28,6 @@ under the License.
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Resource TargetPath Compat Test</name>
-  <description>Test that targetPath in legacy resource elements remains relative through the compat layer</description>
-
   <build>
     <resources>
       <resource>

impl/maven-core/src/test/projects/project-builder/source-target-path/pom.xml

@@ -28,9 +28,6 @@ under the License.
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Source TargetPath Test</name>
-  <description>Test that targetPath in source elements remains relative to output directory</description>
-
   <build>
     <sources>
       <source>

impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelPathTranslator.java

@@ -134,9 +134,9 @@ private Source alignToBaseDirectory(Source source, Path basedir) {
             if (newDir != oldDir) {
                 source = source.withDirectory(newDir);
             }
-            // Note: targetPath is intentionally NOT aligned to basedir.
+            // targetPath is intentionally NOT aligned to basedir.
             // It is relative to the output directory (target/classes or target/test-classes),
-            // not to the project base directory. See maven.mdo Source.targetPath documentation.
+            // not to the project base directory.
         }
         return source;
     }