diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java index 628afd5bea..0f752b8c71 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java @@ -62,6 +62,10 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest { verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" ); } + if ( matchesVersionRange( "(3.2.5,)" ) ) + { + verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() ); + } verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java index 2b4284479e..e8ac3c4361 100644 --- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java +++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java @@ -469,6 +469,11 @@ public abstract class AbstractMavenIntegrationTestCase { verifier.getSystemProperties().put( "org.apache.maven.global-settings", path ); } + + if ( matchesVersionRange( "(3.2.5,)" ) ) + { + verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", basedir ); + } } return verifier;