You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/01/30 15:20:34 UTC
maven-surefire git commit: [SUREFIRE-1221] skipTests parameter
example is incorrect
Repository: maven-surefire
Updated Branches:
refs/heads/master dcd78c05b -> 1e71470b3
[SUREFIRE-1221] skipTests parameter example is incorrect
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1e71470b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1e71470b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1e71470b
Branch: refs/heads/master
Commit: 1e71470b394837a00a33952bcae59e78fc9d578d
Parents: dcd78c0
Author: Michael Osipov <mi...@apache.org>
Authored: Sat Jan 30 15:18:20 2016 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Jan 30 15:18:20 2016 +0100
----------------------------------------------------------------------
.../src/site/apt/examples/skipping-test.apt.vm | 112 -------------------
.../src/site/apt/examples/skipping-tests.apt.vm | 112 +++++++++++++++++++
maven-surefire-plugin/src/site/apt/index.apt.vm | 2 +-
maven-surefire-plugin/src/site/site.xml | 2 +-
4 files changed, 114 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e71470b/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm b/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
deleted file mode 100644
index e6f2947..0000000
--- a/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
+++ /dev/null
@@ -1,112 +0,0 @@
- ------
- Skipping Tests
- ------
- Johnny Ruiz
- Brett Porter
- Allan Ramirez
- ------
- July 2006
- ------
-
- ~~ Licensed to the Apache Software Foundation (ASF) under one
- ~~ or more contributor license agreements. See the NOTICE file
- ~~ distributed with this work for additional information
- ~~ regarding copyright ownership. The ASF licenses this file
- ~~ to you under the Apache License, Version 2.0 (the
- ~~ "License"); you may not use this file except in compliance
- ~~ with the License. You may obtain a copy of the License at
- ~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
- ~~
- ~~ Unless required by applicable law or agreed to in writing,
- ~~ software distributed under the License is distributed on an
- ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~~ KIND, either express or implied. See the License for the
- ~~ specific language governing permissions and limitations
- ~~ under the License.
-
- ~~ NOTE: For help with the syntax of this file, see:
- ~~ http://maven.apache.org/doxia/references/apt-format.html
-
-Skipping Tests
-
- To skip running the tests for a particular project, set the <<skipTests>>
- property to <<true>>.
-
-+---+
-<project>
- [...]
- <build>
- <plugins>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- [...]
-</project>
-+---+
-
- You can also skip the tests via the command line by executing the following command:
-
-+---+
-mvn install -DskipTests
-+---+
-
-#{if}(${project.artifactId}=="maven-failsafe-plugin")
- Since <<<skipTests>>> is also supported by the ${thatPlugin} Plugin, this will have the effect
- of not running any tests. If, instead, you want to skip only the integration tests
- being run by the ${thisPlugin} Plugin, you would use the <<<skipITs>>> property instead:
-
-+---+
-mvn install -DskipITs
-+---+
-
-#{end}
- If you absolutely must, you can also use the <<<maven.test.skip>>> property to skip compiling the tests.
- <<<maven.test.skip>>> is honored by Surefire, Failsafe and the Compiler Plugin.
-
-+---+
-mvn install -Dmaven.test.skip=true
-+---+
-
-Skipping by Default
-
- If you want to skip tests by default but want the ability to re-enable tests from the
- command line, you need to go via a properties section in the pom:
-
-+---+
-<project>
- [...]
- <properties>
- <skipTests>true</skipTests>
- </properties>
- [...]
- <build>
- <plugins>
- <plugin>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- [...]
-</project>
-+---+
-
- This will allow you to run with tests disabled by default and to run them with this command:
-
-+---+
-mvn install -DskipTests=false
-+---+
-
- The same can be done with the <<<skip>>> parameter and other boolean properties of the plugin.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e71470b/maven-surefire-plugin/src/site/apt/examples/skipping-tests.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/examples/skipping-tests.apt.vm b/maven-surefire-plugin/src/site/apt/examples/skipping-tests.apt.vm
new file mode 100644
index 0000000..57dfdc2
--- /dev/null
+++ b/maven-surefire-plugin/src/site/apt/examples/skipping-tests.apt.vm
@@ -0,0 +1,112 @@
+ ------
+ Skipping Tests
+ ------
+ Johnny Ruiz
+ Brett Porter
+ Allan Ramirez
+ ------
+ July 2006
+ ------
+
+ ~~ Licensed to the Apache Software Foundation (ASF) under one
+ ~~ or more contributor license agreements. See the NOTICE file
+ ~~ distributed with this work for additional information
+ ~~ regarding copyright ownership. The ASF licenses this file
+ ~~ to you under the Apache License, Version 2.0 (the
+ ~~ "License"); you may not use this file except in compliance
+ ~~ with the License. You may obtain a copy of the License at
+ ~~
+ ~~ http://www.apache.org/licenses/LICENSE-2.0
+ ~~
+ ~~ Unless required by applicable law or agreed to in writing,
+ ~~ software distributed under the License is distributed on an
+ ~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~~ KIND, either express or implied. See the License for the
+ ~~ specific language governing permissions and limitations
+ ~~ under the License.
+
+ ~~ NOTE: For help with the syntax of this file, see:
+ ~~ http://maven.apache.org/doxia/references/apt-format.html
+
+Skipping Tests
+
+ To skip running the tests for a particular project, set the <<skipTests>>
+ property to <<true>>.
+
++---+
+<project>
+ [...]
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ [...]
+</project>
++---+
+
+ You can also skip the tests via the command line by executing the following command:
+
++---+
+mvn install -DskipTests
++---+
+
+#{if}(${project.artifactId}=="maven-failsafe-plugin")
+ Since <<<skipTests>>> is also supported by the ${thatPlugin} Plugin, this will have the effect
+ of not running any tests. If, instead, you want to skip only the integration tests
+ being run by the ${thisPlugin} Plugin, you would use the <<<skipITs>>> property instead:
+
++---+
+mvn install -DskipITs
++---+
+
+#{end}
+ If you absolutely must, you can also use the <<<maven.test.skip>>> property to skip compiling the tests.
+ <<<maven.test.skip>>> is honored by Surefire, Failsafe and the Compiler Plugin.
+
++---+
+mvn install -Dmaven.test.skip=true
++---+
+
+Skipping by Default
+
+ If you want to skip tests by default but want the ability to re-enable tests from the
+ command line, you need to go via a properties section in the pom:
+
++---+
+<project>
+ [...]
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+ [...]
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <skipTests>${esc.d}{skipTests}</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ [...]
+</project>
++---+
+
+ This will allow you to run with tests disabled by default and to run them with this command:
+
++---+
+mvn install -DskipTests=false
++---+
+
+ The same can be done with the <<<skip>>> parameter and other boolean properties of the plugin.
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e71470b/maven-surefire-plugin/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/apt/index.apt.vm b/maven-surefire-plugin/src/site/apt/index.apt.vm
index 2a3d670..6774491 100644
--- a/maven-surefire-plugin/src/site/apt/index.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/index.apt.vm
@@ -136,7 +136,7 @@ mvn verify
* {{{./examples/pojo-test.html}Using POJO Tests}}
- * {{{./examples/skipping-test.html}Skipping Tests}}
+ * {{{./examples/skipping-tests.html}Skipping Tests}}
* {{{./examples/skip-after-failure.html}Skip After Failure}}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1e71470b/maven-surefire-plugin/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-surefire-plugin/src/site/site.xml b/maven-surefire-plugin/src/site/site.xml
index b3e9cd2..4591f53 100644
--- a/maven-surefire-plugin/src/site/site.xml
+++ b/maven-surefire-plugin/src/site/site.xml
@@ -41,7 +41,7 @@
<item name="Using TestNG" href="examples/testng.html"/>
<item name="Using JUnit" href="examples/junit.html"/>
<item name="Using POJO Tests" href="examples/pojo-test.html"/>
- <item name="Skipping Tests" href="examples/skipping-test.html"/>
+ <item name="Skipping Tests" href="examples/skipping-tests.html"/>
<item name="Skip After Failure" href="examples/skip-after-failure.html"/>
<item name="Inclusions and Exclusions of Tests" href="examples/inclusion-exclusion.html"/>
<item name="Running a Single Test" href="examples/single-test.html"/>