Author: krosenvold
Date: Thu Dec 16 09:32:37 2010
New Revision: 1049844
URL: http://svn.apache.org/viewvc?rev=1049844&view=rev
Log:
[SUREFIRE-501] Documentation update
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1049844&r1=1049843&r2=1049844&view=diff
==============================================================================
---
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
(original)
+++
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
Thu Dec 16 09:32:37 2010
@@ -331,8 +331,9 @@ public class IntegrationTestMojo
private String forkMode;
/**
- * Option to specify the jvm (or path to the java executable) to use with
the forking options. For the default, the
- * jvm will be the same as the one used to run Maven.
+ * Option to specify the jvm (or path to the java executable) to use with
the forking options. For the default, the
+ * jvm will be a new instance of the same VM as the one used to run
Maven. JVM settings are not inherited from
+ * MAVEN_OPTS
*
* @parameter expression="${jvm}"
* @since 2.1
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=1049844&r1=1049843&r2=1049844&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Thu Dec 16 09:32:37 2010
@@ -306,7 +306,8 @@ public class SurefirePlugin
/**
* Option to specify the jvm (or path to the java executable) to use with
the forking options. For the default, the
- * jvm will be the same as the one used to run Maven.
+ * jvm will be a new instance of the same VM as the one used to run Maven.
JVM settings are not inherited from
+ * MAVEN_OPTS
*
* @parameter expression="${jvm}"
* @since 2.1
