modules/enterprise/comm/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 14 ++++---------- pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-)
New commits: commit d71b22a573d7f9e576b23407fcdc4ad4c0c3d846 Author: Ian Springer ian.springer@redhat.com Date: Sat Feb 25 14:36:33 2012 -0500
use correct syntax for passing sysprop to surefire (fixes my previous commit)
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index ae11a4b..f8aa8f9 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -146,7 +146,7 @@ <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> --> - <systemPropertyVariables> + <systemPropertyVariables combine.children="append"> <rhq.comm.test.connectorBindPort>${rhq.comm.test.connectorBindPort}</rhq.comm.test.connectorBindPort> <rhq.comm.test.connector2BindPort>${rhq.comm.test.connector2BindPort}</rhq.comm.test.connector2BindPort> </systemPropertyVariables> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 92068fd..47f2f1c 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -111,16 +111,10 @@ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> <useSystemClassLoader>true</useSystemClassLoader> <argLine>-Dorg.hyperic.sigar.path=${basedir}/target/itest/lib</argLine> - <systemProperties> - <property> - <name>project.artifactId</name> - <value>${project.artifactId}</value> - </property> - <property> - <name>project.version</name> - <value>${project.version}</value> - </property> - </systemProperties> + <systemPropertyVariables combine.children="append"> + <project.artifactId>${project.artifactId}</project.artifactId> + <project.version>${project.version}</project.version> + </systemPropertyVariables> </configuration> </execution> </executions> diff --git a/pom.xml b/pom.xml index 2e346f8..e07cf64 100644 --- a/pom.xml +++ b/pom.xml @@ -820,9 +820,9 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <trimStackTrace>false</trimStackTrace> - <systemProperties> + <systemPropertyVariables> <java.util.prefs.userRoot>${java.io.tmpdir}/${user.name}</java.util.prefs.userRoot> - </systemProperties> + </systemPropertyVariables> </configuration> </plugin>
rhq-commits@lists.fedorahosted.org