Author: stephenc
Date: Mon Jun 27 11:37:36 2011
New Revision: 1140114
URL: http://svn.apache.org/viewvc?rev=1140114&view=rev
Log:
use substitution to help minimize the differences with failsafe
Added:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm
(contents, props changed)
- copied, changed from r1140083,
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt
Removed:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/configuring-classpath.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
Copied:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm
(from r1140083,
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt)
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt&r1=1140083&r2=1140114&rev=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm
Mon Jun 27 11:37:36 2011
@@ -31,7 +31,7 @@ When working with surefire, it is necess
Multi-Module project
The plugin is built as part of a multi-module plugin. The generated
'project information' will suggest that you check out (e.g.)
- http://svn.apache.org/repos/asf/maven/surefire/trunk/maven-surefire-plugin.
+ http://svn.apache.org/repos/asf/maven/surefire/trunk/${project.artifactId}.
In fact, you need to check out (e.g.)
http://svn.apache.org/repos/asf/maven/surefire/trunk and
build from there.
Propchange:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/developingSurefire.apt.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
Mon Jun 27 11:37:36 2011
@@ -149,8 +149,8 @@ java -classpath booter.jar MyApp
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/configuring-classpath.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/configuring-classpath.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/configuring-classpath.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/configuring-classpath.apt.vm
Mon Jun 27 11:37:36 2011
@@ -55,8 +55,8 @@ Additional Classpath Elements
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<additionalClasspathElements>
@@ -83,8 +83,8 @@ Removing Dependency Classpath Elements
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<classpathDependencyExcludes>
@@ -114,8 +114,8 @@ Removing Dependency Classpath Elements
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<classpathDependencyScopeExclude>runtime</classpathDependencyScopeExclude>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
Mon Jun 27 11:37:36 2011
@@ -53,8 +53,8 @@ Inclusions and Exclusions of Tests
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<includes>
@@ -81,8 +81,8 @@ Inclusions and Exclusions of Tests
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<excludes>
@@ -108,8 +108,8 @@ Inclusions and Exclusions of Tests
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<includes>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/junit.apt.vm
Mon Jun 27 11:37:36 2011
@@ -92,8 +92,8 @@ else
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<dependencies>
<dependency>
@@ -117,8 +117,8 @@ else
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<parallel>methods</parallel>
@@ -145,8 +145,8 @@ else
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<properties>
@@ -170,8 +170,8 @@ else
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<systemPropertyVariables>
@@ -190,8 +190,8 @@ else
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<argLine>-Djava.security.manager
-Djava.security.policy=${basedir}/src/test/resources/java.policy</argLine>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/providers.apt.vm
Mon Jun 27 11:37:36 2011
@@ -40,8 +40,8 @@ Selecting providers
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<dependencies>
<dependency>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
Mon Jun 27 11:37:36 2011
@@ -39,8 +39,8 @@ Skipping Tests
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<skipTests>true</skipTests>
@@ -78,8 +78,8 @@ Skipping by default
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<skipTests>${skipTests}</skipTests>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
Mon Jun 27 11:37:36 2011
@@ -42,8 +42,8 @@ Using System Properties
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<systemPropertyVariables>
@@ -68,8 +68,8 @@ Using System Properties
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<systemProperties>
@@ -98,8 +98,8 @@ Using System Properties
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<systemProperties>
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm?rev=1140114&r1=1140113&r2=1140114&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
Mon Jun 27 11:37:36 2011
@@ -74,8 +74,8 @@ Using TestNG
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<suiteXmlFiles>
@@ -96,8 +96,8 @@ Using TestNG
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<systemPropertyVariables>
@@ -118,8 +118,8 @@ Using TestNG
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<groups>functest,perftest</groups>
@@ -139,8 +139,8 @@ Using TestNG
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<parallel>methods</parallel>
@@ -163,8 +163,8 @@ Using TestNG
+---+
[...]
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<configuration>
<properties>
