Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MNG-5767 enforce use of maven.multiModuleProjectDirectory 

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
This commit is contained in:
Igor Fedorenko 2015-02-26 11:51:30 -05:00
parent 78c916b70e
commit ba27d4ea52
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
View File

@ -62,6 +62,10 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
{ {
verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" ); 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.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog(); verifier.verifyErrorFreeLog();
verifier.resetStreams(); verifier.resetStreams();

5
its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
View File

@ -469,6 +469,11 @@ public abstract class AbstractMavenIntegrationTestCase
{ {
verifier.getSystemProperties().put( "org.apache.maven.global-settings", path ); verifier.getSystemProperties().put( "org.apache.maven.global-settings", path );
} }
if ( matchesVersionRange( "(3.2.5,)" ) )
{
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", basedir );
}
} }
return verifier; return verifier;