[maven-integration-testing] branch master updated: [MNG-7862] The ModelLocator should always be used when locating pom.xml (fixes #289)

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new 981287252 [MNG-7862] The ModelLocator should always be used when locating pom.xml  (fixes #289)
981287252 is described below

commit 9812872521d53bfc3b35ae4d549053934deb6f00
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Wed Aug 23 21:24:44 2023 +0200

    [MNG-7862] The ModelLocator should always be used when locating pom.xml  (fixes #289)
---
 .../java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index 938463233..a5bd36b0e 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -274,7 +274,8 @@ public class MavenITmng3843PomInheritanceTest extends AbstractMavenIntegrationTe
 
         basedir = new File(verifier.getBasedir(), "test-3/sub-parent/child-a");
         props = verifier.loadProperties("test-3/sub-parent/child-a/target/pom.properties");
-        assertEquals("../pom.xml", props.getProperty("project.originalModel.parent.relativePath"));
+        String val = matchesVersionRange("(4.0-alpha-7,)") ? ".." : "../pom.xml";
+        assertEquals(val, props.getProperty("project.originalModel.parent.relativePath"));
     }
 
     private void assertPathEquals(File basedir, String expected, String actual) {