Author: brett
Date: Tue Mar 28 20:04:06 2006
New Revision: 389666
URL: http://svn.apache.org/viewcvs?rev=389666&view=rev
Log:
merge r389431, 389432 from trunk
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/pom.xml
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/howto.apt
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/introduction.apt
Modified: maven/plugins/branches/maven-surefire-plugin-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/pom.xml?rev=389666&r1=389665&r2=389666&view=diff
==============================================================================
--- maven/plugins/branches/maven-surefire-plugin-testng/pom.xml (original)
+++ maven/plugins/branches/maven-surefire-plugin-testng/pom.xml Tue Mar 28
20:04:06 2006
@@ -3,7 +3,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>1</version>
+ <version>2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-plugin</artifactId>
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=389666&r1=389665&r2=389666&view=diff
==============================================================================
---
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
(original)
+++
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
Tue Mar 28 20:04:06 2006
@@ -214,7 +214,7 @@
private boolean useFile;
/**
- * Option to specify the forking mode. Can be "none", "once" or "pertest"
+ * Option to specify the forking mode. Can be "none", "once" or "pertest".
*
* @parameter expression="${forkMode}"
* default-value="none"
@@ -252,7 +252,10 @@
private File workingDirectory;
/**
- * Whether to run the tests in an isolated classloader, or to delegate to
the system classloader when forking.
+ * When false it makes tests run using the standard classloader delegation
instead of the default
+ * Maven isolated classloader. Only used when forking (forkMode is not
"none").<br/>
+ * Setting it to false helps with some problems caused by conflicts between
+ * xml parsers in the classpath and the Java 5 provider parser.
*
* @parameter expression="${childDelegation}"
* default-value="true"
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/howto.apt
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/howto.apt?rev=389666&r1=389665&r2=389666&view=diff
==============================================================================
--- maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/howto.apt
(original)
+++ maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/howto.apt
Tue Mar 28 20:04:06 2006
@@ -33,7 +33,7 @@
Alternatively, you can execute the following on the command line to skip
tests:
-----
-m2 -Dmaven.test.skip=true install
+mvn -Dmaven.test.skip=true install
-----
* Using System Properties
@@ -120,11 +120,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>Sample.java</include>
- </includes>
- </configuration>
+ <configuration>
+ <includes>
+ <include>Sample.java</include>
+ </includes>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -143,15 +143,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- <includes>
- <include>PentagonTest.java</include>
- <include>OctagonTest.java</include>
- </includes>
- </configuration>
+ <configuration>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>PentagonTest.java</include>
+ <include>OctagonTest.java</include>
+ </includes>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -175,12 +175,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>TestCircle.java</exclude>
- <exclude>TestSquare.java</exclude>
- </excludes>
- </configuration>
+ <configuration>
+ <excludes>
+ <exclude>TestCircle.java</exclude>
+ <exclude>TestSquare.java</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -200,11 +200,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/Test*.java</exclude>
- </excludes>
- </configuration>
+ <configuration>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/introduction.apt
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/introduction.apt?rev=389666&r1=389665&r2=389666&view=diff
==============================================================================
---
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/introduction.apt
(original)
+++
maven/plugins/branches/maven-surefire-plugin-testng/src/site/apt/introduction.apt
Tue Mar 28 20:04:06 2006
@@ -11,6 +11,6 @@
This plugin runs the junit tests in an isolated classloader. By default,
this plugin will be executed in
"test" phase of m2 lifecycle.
- This plugin generates 2 types of report, Text File Report and XML File
Report. Both files will be generated in the
- ${basedir}/target/surefire-report. For an HTML version of the report, please
see the Maven Surefire Report Plugin.
+ This plugin generates 2 types of report, Text File Report and XML File
Report. Both files will be generated in the
+ <<<${basedir}/target/surefire-report>>>. For an HTML version of the report,
please see the Maven Surefire Report Plugin.
