You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/11/04 06:08:59 UTC
[maven-surefire] 02/03: avoided surefire version 2.12.4 in IT logs
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch buildfix
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 09ff5381cba13fcdbc1a19747271ab923caa8a46
Author: Tibor17 <ti...@apache.org>
AuthorDate: Sun Nov 4 07:03:26 2018 +0100
avoided surefire version 2.12.4 in IT logs
---
surefire-its/src/test/resources/failsafe-notests/pom.xml | 8 ++++++++
.../pom.xml | 10 ++++++++++
.../surefire-141-pluggableproviders-provider/pom.xml | 10 ++++++++++
.../test/resources/surefire-141-pluggableproviders/pom.xml | 1 -
.../src/test/resources/surefire-740-comma-truncated/pom.xml | 8 ++++++++
.../test/resources/surefire-930-failsafe-runtests/pom.xml | 3 ++-
.../src/test/resources/surefire-942-testngSuite/pom.xml | 4 ----
.../resources/surefire-946-self-destruct-plugin/pom.xml | 13 +++++++++++++
.../src/test/resources/test-helper-dump-pid-plugin/pom.xml | 8 ++++++++
9 files changed, 59 insertions(+), 6 deletions(-)
diff --git a/surefire-its/src/test/resources/failsafe-notests/pom.xml b/surefire-its/src/test/resources/failsafe-notests/pom.xml
index 24d1dec..331f83a 100644
--- a/surefire-its/src/test/resources/failsafe-notests/pom.xml
+++ b/surefire-its/src/test/resources/failsafe-notests/pom.xml
@@ -43,6 +43,14 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- Successfully verifies no tests to run. The build should not fail. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire.version}</version>
diff --git a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
index 30e5199..274057c 100644
--- a/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1396-pluggableproviders-classpath-provider/pom.xml
@@ -46,6 +46,16 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <!-- No test sources here. See the tests in "surefire-1396-pluggableproviders-classpath". -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
index 10a40c4..1aa279a 100644
--- a/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders-provider/pom.xml
@@ -46,6 +46,16 @@
<targetPath>META-INF</targetPath>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <!-- No test sources here. See the tests in "surefire-141-pluggableproviders". -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
index 1a92a0c..cb406de 100644
--- a/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
+++ b/surefire-its/src/test/resources/surefire-141-pluggableproviders/pom.xml
@@ -38,7 +38,6 @@
</dependencies>
<properties>
- <surefire.version>2.12.4</surefire.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
diff --git a/surefire-its/src/test/resources/surefire-740-comma-truncated/pom.xml b/surefire-its/src/test/resources/surefire-740-comma-truncated/pom.xml
index 5291cc6..9c26210 100644
--- a/surefire-its/src/test/resources/surefire-740-comma-truncated/pom.xml
+++ b/surefire-its/src/test/resources/surefire-740-comma-truncated/pom.xml
@@ -40,6 +40,14 @@
<build>
<plugins>
<plugin>
+ <!-- There is no test - TEST-*.xml reports are attached in project -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
diff --git a/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml b/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
index 8535068..5cdb2a0 100644
--- a/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
+++ b/surefire-its/src/test/resources/surefire-930-failsafe-runtests/pom.xml
@@ -10,7 +10,6 @@
<description>surefire-930</description>
<properties>
- <surefire.version>2.12.4</surefire.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
@@ -26,7 +25,9 @@
<build>
<plugins>
<plugin>
+ <!-- Test reports were generated from the test sources by the developer. -->
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml b/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml
index 2a0fac5..4ea86b9 100644
--- a/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml
+++ b/surefire-its/src/test/resources/surefire-942-testngSuite/pom.xml
@@ -8,10 +8,6 @@
<artifactId>surefire-testng</artifactId>
<version>1.0-SNAPSHOT</version>
- <properties>
- <surefire.version>2.12.4</surefire.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.testng</groupId>
diff --git a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
index 811be93..ad4ff00 100644
--- a/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
+++ b/surefire-its/src/test/resources/surefire-946-self-destruct-plugin/pom.xml
@@ -48,6 +48,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!--
+ No test sources here.
+ This is only a custom plugin.
+ Purpose to pre-install.
+ See the Surefire946KillMainProcessInReusableForkIT.
+ -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml b/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
index 28cf17d..f6bfa7c 100644
--- a/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
+++ b/surefire-its/src/test/resources/test-helper-dump-pid-plugin/pom.xml
@@ -54,6 +54,14 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <!-- No test sources here. See the ForkModeIT and surefire-its/src/main/resources/fork-mode. -->
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>