You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/08/03 14:58:16 UTC

svn commit: r981853 - in /maven/core-integration-testing/trunk: core-it-suite/pom.xml core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java

Author: bentmann
Date: Tue Aug  3 12:58:16 2010
New Revision: 981853

URL: http://svn.apache.org/viewvc?rev=981853&view=rev
Log:
o Used property prefix different from Surefire props

Modified:
    maven/core-integration-testing/trunk/core-it-suite/pom.xml
    maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java

Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=981853&r1=981852&r2=981853&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Tue Aug  3 12:58:16 2010
@@ -150,7 +150,7 @@ under the License.
               <value>${preparedMavenHome}</value>
             </property>
             <property>
-              <name>maven.test.global-settings</name>
+              <name>maven.it.global-settings</name>
               <value>${project.build.testOutputDirectory}/settings.xml</value>
             </property>
           </systemProperties>

Modified: maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java?rev=981853&r1=981852&r2=981853&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java (original)
+++ maven/core-integration-testing/trunk/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java Tue Aug  3 12:58:16 2010
@@ -354,7 +354,7 @@ public abstract class AbstractMavenInteg
     protected File setupLocalRepo()
         throws IOException
     {
-        String tempDirPath = System.getProperty( "maven.test.tmpdir", System.getProperty( "java.io.tmpdir" ) );
+        String tempDirPath = System.getProperty( "maven.it.tmpdir", System.getProperty( "java.io.tmpdir" ) );
         File localRepo = new File( tempDirPath, "local-repository/" + getITName() );
         if ( localRepo.isDirectory() )
         {
@@ -398,7 +398,7 @@ public abstract class AbstractMavenInteg
 
         verifier.setAutoclean( false );
 
-        String globalSettings = System.getProperty( "maven.test.global-settings", "" );
+        String globalSettings = System.getProperty( "maven.it.global-settings", "" );
         if ( globalSettings.length() > 0 )
         {
             globalSettings = new File( globalSettings ).getAbsolutePath();