You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by if...@apache.org on 2015/02/26 17:51:35 UTC
maven-integration-testing git commit: MNG-5767 enforce use of
maven.multiModuleProjectDirectory
Repository: maven-integration-testing
Updated Branches:
refs/heads/master 3743ceb54 -> f87311948
MNG-5767 enforce use of maven.multiModuleProjectDirectory
Signed-off-by: Igor Fedorenko <if...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/f8731194
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/f8731194
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/f8731194
Branch: refs/heads/master
Commit: f87311948a7b99984ceb297713ce09f76c8c9849
Parents: 3743ceb
Author: Igor Fedorenko <if...@apache.org>
Authored: Thu Feb 26 11:51:30 2015 -0500
Committer: Igor Fedorenko <if...@apache.org>
Committed: Thu Feb 26 11:51:30 2015 -0500
----------------------------------------------------------------------
.../maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java | 4 ++++
.../org/apache/maven/it/AbstractMavenIntegrationTestCase.java | 5 +++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f8731194/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index 628afd5..0f752b8 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/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();
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/f8731194/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 2b42844..e8ac3c4 100644
--- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/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;