Author: jvanzyl Date: Tue Dec 13 18:02:34 2005 New Revision: 356699 URL: http://svn.apache.org/viewcvs?rev=356699&view=rev Log: o updating to release of surefire
Modified: maven/plugins/trunk/maven-surefire-plugin/pom.xml maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Modified: maven/plugins/trunk/maven-surefire-plugin/pom.xml URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/pom.xml?rev=356699&r1=356698&r2=356699&view=diff ============================================================================== --- maven/plugins/trunk/maven-surefire-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-surefire-plugin/pom.xml Tue Dec 13 18:02:34 2005 @@ -24,8 +24,13 @@ </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-booter</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <scope>runtime</scope> </dependency> <dependency> @@ -37,11 +42,6 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>2.0</version> - </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-booter</artifactId> - <version>1.5-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=356699&r1=356698&r2=356699&view=diff ============================================================================== --- maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original) +++ maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Tue Dec 13 18:02:34 2005 @@ -232,10 +232,10 @@ // Forking // ---------------------------------------------------------------------- + surefireBooter.setForkMode( forkMode ); + if ( !forkMode.equals( "none" ) ) { - surefireBooter.setForkMode( forkMode ); - surefireBooter.setSystemProperties( systemProperties ); surefireBooter.setJvm( jvm );