You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2014/02/21 21:18:35 UTC
git commit: Make it more convenient to run a Maven integration test
from within the workspace against the version of Maven also in the workspace.
Repository: maven-integration-testing
Updated Branches:
refs/heads/master a321d35ed -> 3aa0589ff
Make it more convenient to run a Maven integration test from within the workspace against the version of Maven also in the workspace.
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/3aa0589f
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/3aa0589f
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/3aa0589f
Branch: refs/heads/master
Commit: 3aa0589ff67410a0320e7ee7399ad510dcb93e8b
Parents: a321d35
Author: Jason van Zyl <ja...@tesla.io>
Authored: Fri Feb 21 12:17:29 2014 -0800
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Fri Feb 21 12:17:29 2014 -0800
----------------------------------------------------------------------
.../org/apache/maven/it/AbstractMavenIntegrationTestCase.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/3aa0589f/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 21de3f6..349acde 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
@@ -441,6 +441,13 @@ public abstract class AbstractMavenIntegrationTestCase
{
settingsFile = new File( settingsDir, settingsFile.getPath() );
}
+ else
+ {
+ //
+ // Make is easier to run ITs from m2e in Maven IT mode without having to set any additional properties.
+ //
+ settingsFile = new File( "target/test-classes", settingsFile.getPath() );
+ }
}
String path = settingsFile.getAbsolutePath();