You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/08/03 20:15:06 UTC
svn commit: r1369137 -
/maven/surefire/trunk/surefire-integration-tests/pom.xml
Author: olamy
Date: Fri Aug 3 18:15:06 2012
New Revision: 1369137
URL: http://svn.apache.org/viewvc?rev=1369137&view=rev
Log:
use more compact configuration
Modified:
maven/surefire/trunk/surefire-integration-tests/pom.xml
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=1369137&r1=1369136&r2=1369137&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Fri Aug 3 18:15:06 2012
@@ -37,6 +37,7 @@
<it.settings.showPasswords>false</it.settings.showPasswords>
<testng.version>5.7</testng.version>
<surefire.threadcount>1</surefire.threadcount>
+ <mavenHomeUsed>${maven.home}</mavenHomeUsed>
</properties>
<dependencies>
@@ -88,33 +89,14 @@
<configuration>
<!-- Pass current surefire version to the main suite so that it -->
<!-- can forward to all integration test projects. SUREFIRE-513 -->
- <systemProperties>
- <property>
- <name>surefire.version</name>
- <value>${project.version}</value>
- </property>
- <property>
- <name>testng.version</name>
- <value>${testng.version}</value>
- </property>
- <property>
- <name>maven.home</name>
- <value>${maven.home}</value>
- </property>
- <property>
- <name>maven.settings.file</name>
- <value>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml</value>
- </property>
- <property>
- <name>maven.repo.local</name>
- <value>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</value>
- </property>
- <property>
- <name>maven.test.tmpdir</name>
- <value>${project.build.directory}</value>
- </property>
- </systemProperties>
-
+ <systemPropertyVariables>
+ <surefire.version>${project.version}</surefire.version>
+ <testng.version>${testng.version}</testng.version>
+ <maven.home>${mavenHomeUsed}</maven.home>
+ <maven.settings.file>${project.basedir}/../surefire-setup-integration-tests/target/private/it-settings.xml</maven.settings.file>
+ <maven.repo.local>${project.basedir}/../surefire-setup-integration-tests/target/it-repo</maven.repo.local>
+ <maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
+ </systemPropertyVariables>
</configuration>
<executions>
<execution>