You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/01/20 20:18:12 UTC
svn commit: r901337 - in /cxf/branches/2.2.x-fixes: ./ parent/pom.xml pom.xml
Author: dkulp
Date: Wed Jan 20 19:18:11 2010
New Revision: 901337
URL: http://svn.apache.org/viewvc?rev=901337&view=rev
Log:
Merged revisions 901298 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r901298 | dkulp | 2010-01-20 12:37:56 -0500 (Wed, 20 Jan 2010) | 1 line
Update surefire to 2.5 to start playing around with parallel tests
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/parent/pom.xml
cxf/branches/2.2.x-fixes/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=901337&r1=901336&r2=901337&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Wed Jan 20 19:18:11 2010
@@ -36,6 +36,7 @@
<surefire.fork.mode>once</surefire.fork.mode>
<surefire.format>brief</surefire.format>
<surefire.usefile>false</surefire.usefile>
+ <surefire.parallel.mode/>
<surefire.fork.vmargs>-ea</surefire.fork.vmargs>
<server.launcher.vmargs>-ea</server.launcher.vmargs>
<surefire.extra.sysprop.name1>None</surefire.extra.sysprop.name1>
@@ -265,6 +266,7 @@
<forkMode>${surefire.fork.mode}</forkMode>
<childDelegation>false</childDelegation>
<argLine>${surefire.fork.vmargs}</argLine>
+ <parallel>${surefire.parallel.mode}</parallel>
<systemProperties>
<property>
<name>${surefire.extra.sysprop.name1}</name>
@@ -1141,7 +1143,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: cxf/branches/2.2.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/pom.xml?rev=901337&r1=901336&r2=901337&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/pom.xml Wed Jan 20 19:18:11 2010
@@ -417,7 +417,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -490,7 +490,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>