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 2020/06/21 15:02:38 UTC
[maven-surefire] 01/01: [GH] optimized exec time in two Windows
containers
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch faster-build
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 65be94dc0fba8ea538cfe5ecdbbf0cdec1a116b6
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Jun 21 14:51:15 2020 +0200
[GH] optimized exec time in two Windows containers
---
.github/workflows/maven-windows-it1.yml | 2 +-
.github/workflows/maven-windows-it2.yml | 2 +-
surefire-its/pom.xml | 12 ------------
.../java/org/apache/maven/surefire/its/JUnitPlatformIT.java | 5 +----
.../maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java | 2 +-
5 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/maven-windows-it1.yml b/.github/workflows/maven-windows-it1.yml
index ebdc5d7..4679153 100644
--- a/.github/workflows/maven-windows-it1.yml
+++ b/.github/workflows/maven-windows-it1.yml
@@ -33,4 +33,4 @@ jobs:
java-version: 14
- name: Build with Maven
- run: mvn install -e -B -V -nsu --no-transfer-progress -P run-its "-Dit.test=**/jiras/*IT*.java"
+ run: mvn install -e -B -V -nsu --no-transfer-progress -P run-its "-Dit.test=**/jiras/*IT*.java,TestMethodPatternIT,TestMultipleMethodPatternsIT,TestMultipleMethodPatternsTestNGIT"
diff --git a/.github/workflows/maven-windows-it2.yml b/.github/workflows/maven-windows-it2.yml
index 3bf0539..58a04c1 100644
--- a/.github/workflows/maven-windows-it2.yml
+++ b/.github/workflows/maven-windows-it2.yml
@@ -36,4 +36,4 @@ jobs:
run: mvn install -e -B -V -nsu --no-transfer-progress -DskipTests
- name: Build with Maven without Unit Tests
- run: mvn install -e -B -V -nsu --no-transfer-progress -rf :surefire-its -P run-its "-Dit.test=!**/jiras/*IT*.java"
+ run: mvn install -e -B -V -nsu --no-transfer-progress -rf :surefire-its -P run-its "-Dit.test=!**/jiras/*IT*.java,!TestMethodPatternIT,!TestMultipleMethodPatternsIT,!TestMultipleMethodPatternsTestNGIT"
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index cd5cd5c..8253245 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -651,12 +651,6 @@
<configuration><artifact>org.junit.vintage:junit-vintage-engine:5.4.2</artifact></configuration>
</execution>
<execution>
- <id>vintage-5.5</id>
- <phase>pre-integration-test</phase>
- <goals><goal>get</goal></goals>
- <configuration><artifact>org.junit.vintage:junit-vintage-engine:5.5.0</artifact></configuration>
- </execution>
- <execution>
<id>vintage-5.5.2</id>
<phase>pre-integration-test</phase>
<goals><goal>get</goal></goals>
@@ -711,12 +705,6 @@
<configuration><artifact>org.junit.jupiter:junit-jupiter-engine:5.4.2</artifact></configuration>
</execution>
<execution>
- <id>jupiter-5.5</id>
- <phase>pre-integration-test</phase>
- <goals><goal>get</goal></goals>
- <configuration><artifact>org.junit.jupiter:junit-jupiter-engine:5.5.0</artifact></configuration>
- </execution>
- <execution>
<id>jupiter-5.5.2</id>
<phase>pre-integration-test</phase>
<goals><goal>get</goal></goals>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 073cbf9..b229ab7 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -54,12 +54,9 @@ public class JUnitPlatformIT
{
ArrayList<Object[]> args = new ArrayList<>();
args.add( new Object[] { "5.2.0", "0.8.0" } );
- args.add( new Object[] { "5.3.0", "0.8.15" } );
args.add( new Object[] { "5.3.2", "0.9.0" } );
- args.add( new Object[] { "5.4.0", "0.9.3" } );
args.add( new Object[] { "5.4.2", "1.0.0" } );
- args.add( new Object[] { "5.5.0", "1.1.0" } );
- args.add( new Object[] { "5.5.2", "1.1.0" } );
+ args.add( new Object[] { "5.5.2", "0.8.15" } );
args.add( new Object[] { "5.6.2", "1.2.7" } );
//args.add( new Object[] { "5.7.0-SNAPSHOT", "1.2.7" } );
return args;
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java
index 1ae105f..2b2b3b4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformRerunFailingTestsIT.java
@@ -36,7 +36,7 @@ import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaV
@SuppressWarnings( "checkstyle:magicnumber" )
public class JUnitPlatformRerunFailingTestsIT extends SurefireJUnit4IntegrationTestCase
{
- private static final String VERSION = "5.5.1";
+ private static final String VERSION = "5.5.2";
private SurefireLauncher unpack()
{