You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/01/03 15:57:44 UTC
[maven-surefire] 02/02: [SUREFIRE-2138] Update JUnit4/JUnit5 versions in ITs
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit d3dafe4d36b6dd981c399dd816111762213186f3
Author: Pabst, Andreas <an...@zeiss.com>
AuthorDate: Thu Dec 29 18:27:56 2022 +0100
[SUREFIRE-2138] Update JUnit4/JUnit5 versions in ITs
- Add 4.13.1 and 4.13.2 to JUnitVersion and JUnit4VersionsIT
- Use 4.13.2 where 4.13 or 4.13.1 was used
- Use 5.9.1 in all tests except if a specific version is needed
- Add the necessary requires for org.junit.jupiter.api to the
module-info.java where it was still missing
---
.../surefire/its/JUnit4RerunFailingTestsIT.java | 42 +++++++++++-----------
.../maven/surefire/its/JUnit4VersionsIT.java | 6 +++-
.../its/JUnitPlatformRerunFailingTestsIT.java | 2 +-
.../apache/maven/surefire/its/JUnitVersion.java | 4 ++-
.../resources/assumpationFailureReport/pom.xml | 2 +-
.../src/test/resources/java9-full-api/pom.xml | 2 +-
surefire-its/src/test/resources/junit-4-5/pom.xml | 24 ++++++-------
surefire-its/src/test/resources/junit4/pom.xml | 2 +-
.../src/test/resources/junit5-modulepath/pom.xml | 2 +-
.../src/test/resources/junit5-runner/pom.xml | 4 +--
.../src/test/resources/junit5-spock/pom.xml | 2 +-
.../maven-multimodule-project-with-jpms/pom.xml | 2 +-
surefire-its/src/test/resources/runOrder/pom.xml | 2 +-
.../pom.xml | 2 +-
.../src/test/resources/surefire-1570/pom.xml | 2 +-
.../resources/surefire-1585-junit4-vintage/pom.xml | 4 +--
.../resources/surefire-1585-jupiter-api/pom.xml | 2 +-
.../surefire-1614-stream-corruption/pom.xml | 2 +-
.../surefire-1659-stream-corruption/pom.xml | 2 +-
.../pom.xml | 2 +-
.../src/test/java/module-info.java | 1 +
.../test/resources/surefire-1733-junit4/pom.xml | 2 +-
.../src/test/resources/surefire-1881/pom.xml | 2 +-
.../surefire-1993-jpms-providing-modules/pom.xml | 2 +-
.../src/test/resources/surefire-2036/pom.xml | 4 +--
25 files changed, 66 insertions(+), 57 deletions(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
index aff6c176a..3903dd431 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java
@@ -32,6 +32,8 @@ import org.junit.Test;
public class JUnit4RerunFailingTestsIT
extends SurefireJUnit4IntegrationTestCase
{
+ private static final String VERSION = "4.13.2";
+
private SurefireLauncher unpack()
{
return unpack( "/junit4-rerun-failing-tests" );
@@ -41,22 +43,22 @@ public class JUnit4RerunFailingTestsIT
public void testRerunFailingErrorTestsWithOneRetry()
{
OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0,
0 );
verifyFailuresOneRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
"-DforkCount=2" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresOneRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
"-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresOneRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
"-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresOneRetryAllClasses( outputValidator );
@@ -67,24 +69,24 @@ public class JUnit4RerunFailingTestsIT
{
// Four flakes, both tests have been re-run twice
OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=2" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
verifyFailuresTwoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-DforkCount=3" ).executeTest()
.assertTestSuiteResults( 5, 0, 0, 0, 4 );
verifyFailuresTwoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=methods" ).addGoal(
"-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
verifyFailuresTwoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=2" ).addGoal( "-Dparallel=classes" ).addGoal(
"-DuseUnlimitedThreads=true" ).executeTest().assertTestSuiteResults( 5, 0, 0, 0, 4 );
@@ -95,22 +97,22 @@ public class JUnit4RerunFailingTestsIT
public void testRerunFailingErrorTestsFalse()
{
OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
- "4.13" ).maven().withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
+ VERSION ).maven().withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresNoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-DforkCount=3" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresNoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dparallel=methods" ).addGoal(
"-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
verifyFailuresNoRetryAllClasses( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dparallel=classes" ).addGoal(
"-DuseUnlimitedThreads=true" ).withFailure().executeTest().assertTestSuiteResults( 5, 1, 1, 0, 0 );
@@ -121,26 +123,26 @@ public class JUnit4RerunFailingTestsIT
public void testRerunOneTestClass()
{
OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
"-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
verifyFailuresOneRetryOneClass( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
"-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
verifyFailuresOneRetryOneClass( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
"-DuseUnlimitedThreads=true" ).addGoal(
"-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
verifyFailuresOneRetryOneClass( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
"-DuseUnlimitedThreads=true" ).addGoal(
"-Dtest=FlakyFirstTimeTest" ).withFailure().executeTest().assertTestSuiteResults( 3, 1, 1, 0, 0 );
@@ -152,21 +154,21 @@ public class JUnit4RerunFailingTestsIT
public void testRerunOneTestMethod()
{
OutputValidator outputValidator =
- unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal(
"-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1,
0, 0 );
verifyFailuresOneRetryOneMethod( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-DforkCount=3" ).addGoal(
"-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
0 );
verifyFailuresOneRetryOneMethod( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=methods" ).addGoal(
"-DuseUnlimitedThreads=true" ).addGoal(
"-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
@@ -174,7 +176,7 @@ public class JUnit4RerunFailingTestsIT
verifyFailuresOneRetryOneMethod( outputValidator );
- outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( "4.13" ).maven().addGoal(
+ outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion( VERSION ).maven().addGoal(
"-Dsurefire.rerunFailingTestsCount=1" ).addGoal( "-Dparallel=classes" ).addGoal(
"-DuseUnlimitedThreads=true" ).addGoal(
"-Dtest=FlakyFirstTimeTest#testFailing*" ).withFailure().executeTest().assertTestSuiteResults( 1, 0, 1, 0,
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
index 697b449bf..f907152a4 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
@@ -35,6 +35,8 @@ import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_10;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_11;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_12;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_13;
+import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_13_1;
+import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_13_2;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_2;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_3;
import static org.apache.maven.surefire.its.JUnitVersion.JUNIT_4_3_1;
@@ -78,7 +80,9 @@ public class JUnit4VersionsIT
{ JUNIT_4_10 },
{ JUNIT_4_11 },
{ JUNIT_4_12 },
- { JUNIT_4_13 }
+ { JUNIT_4_13 },
+ { JUNIT_4_13_1 },
+ { JUNIT_4_13_2 }
} );
}
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 93a475942..4b99a8a24 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
@@ -33,7 +33,7 @@ import org.junit.Test;
@SuppressWarnings( "checkstyle:magicnumber" )
public class JUnitPlatformRerunFailingTestsIT extends SurefireJUnit4IntegrationTestCase
{
- private static final String VERSION = "5.5.2";
+ private static final String VERSION = "5.9.1";
private SurefireLauncher unpack()
{
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitVersion.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitVersion.java
index 69f43538c..e63b5c11e 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitVersion.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitVersion.java
@@ -43,7 +43,9 @@ public enum JUnitVersion
JUNIT_4_10( "4.10" ),
JUNIT_4_11( "4.11" ),
JUNIT_4_12( "4.12" ),
- JUNIT_4_13( "4.13" );
+ JUNIT_4_13( "4.13" ),
+ JUNIT_4_13_1( "4.13.1" ),
+ JUNIT_4_13_2( "4.13.2" );
private final String version;
diff --git a/surefire-its/src/test/resources/assumpationFailureReport/pom.xml b/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
index 6dd362651..2eb5f87bd 100644
--- a/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
+++ b/surefire-its/src/test/resources/assumpationFailureReport/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
</dependency>
</dependencies>
<build>
diff --git a/surefire-its/src/test/resources/java9-full-api/pom.xml b/surefire-its/src/test/resources/java9-full-api/pom.xml
index 562f94fcb..ec08999fb 100644
--- a/surefire-its/src/test/resources/java9-full-api/pom.xml
+++ b/surefire-its/src/test/resources/java9-full-api/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/surefire-its/src/test/resources/junit-4-5/pom.xml b/surefire-its/src/test/resources/junit-4-5/pom.xml
index 5f6a5a4f0..f202a4c96 100644
--- a/surefire-its/src/test/resources/junit-4-5/pom.xml
+++ b/surefire-its/src/test/resources/junit-4-5/pom.xml
@@ -52,13 +52,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -69,13 +69,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -86,13 +86,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -103,13 +103,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
</dependency>
</dependencies>
</plugin>
@@ -135,13 +135,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -154,7 +154,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
</dependency>
</dependencies>
</plugin>
diff --git a/surefire-its/src/test/resources/junit4/pom.xml b/surefire-its/src/test/resources/junit4/pom.xml
index 561345873..f795955ef 100644
--- a/surefire-its/src/test/resources/junit4/pom.xml
+++ b/surefire-its/src/test/resources/junit4/pom.xml
@@ -28,7 +28,7 @@
<name>Test for JUnit 4</name>
<properties>
- <junitVersion>4.13</junitVersion>
+ <junitVersion>4.13.2</junitVersion>
<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/junit5-modulepath/pom.xml b/surefire-its/src/test/resources/junit5-modulepath/pom.xml
index c997bd0cd..fbb12843b 100644
--- a/surefire-its/src/test/resources/junit5-modulepath/pom.xml
+++ b/surefire-its/src/test/resources/junit5-modulepath/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/junit5-runner/pom.xml b/surefire-its/src/test/resources/junit5-runner/pom.xml
index c667e030f..ee78e7aa9 100644
--- a/surefire-its/src/test/resources/junit5-runner/pom.xml
+++ b/surefire-its/src/test/resources/junit5-runner/pom.xml
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
- <version>1.6.2</version>
+ <version>1.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/junit5-spock/pom.xml b/surefire-its/src/test/resources/junit5-spock/pom.xml
index feb7e1d49..c90d0ff63 100644
--- a/surefire-its/src/test/resources/junit5-spock/pom.xml
+++ b/surefire-its/src/test/resources/junit5-spock/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/maven-multimodule-project-with-jpms/pom.xml b/surefire-its/src/test/resources/maven-multimodule-project-with-jpms/pom.xml
index 00e047f58..c2537ebb1 100644
--- a/surefire-its/src/test/resources/maven-multimodule-project-with-jpms/pom.xml
+++ b/surefire-its/src/test/resources/maven-multimodule-project-with-jpms/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/surefire-its/src/test/resources/runOrder/pom.xml b/surefire-its/src/test/resources/runOrder/pom.xml
index 5bfad1487..012da053d 100644
--- a/surefire-its/src/test/resources/runOrder/pom.xml
+++ b/surefire-its/src/test/resources/runOrder/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.5.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml b/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
index 0f5d35473..ebb01461b 100644
--- a/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
@@ -31,7 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>${java.specification.version}</maven.compiler.release>
- <junit.version>5.3.2</junit.version>
+ <junit.version>5.9.1</junit.version>
</properties>
<contributors>
diff --git a/surefire-its/src/test/resources/surefire-1570/pom.xml b/surefire-its/src/test/resources/surefire-1570/pom.xml
index 0f6bc9a2f..9943f8ddb 100644
--- a/surefire-its/src/test/resources/surefire-1570/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1570/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/surefire-its/src/test/resources/surefire-1585-junit4-vintage/pom.xml b/surefire-its/src/test/resources/surefire-1585-junit4-vintage/pom.xml
index 7bdf14843..a39d59568 100644
--- a/surefire-its/src/test/resources/surefire-1585-junit4-vintage/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1585-junit4-vintage/pom.xml
@@ -30,14 +30,14 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <junit.vintage.version>5.4.0</junit.vintage.version>
+ <junit.vintage.version>5.9.1</junit.vintage.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1585-jupiter-api/pom.xml b/surefire-its/src/test/resources/surefire-1585-jupiter-api/pom.xml
index 652ae493b..de46af0e8 100644
--- a/surefire-its/src/test/resources/surefire-1585-jupiter-api/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1585-jupiter-api/pom.xml
@@ -30,7 +30,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <junit.jupiter.version>5.4.0</junit.jupiter.version>
+ <junit.jupiter.version>5.9.1</junit.jupiter.version>
</properties>
<dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1614-stream-corruption/pom.xml b/surefire-its/src/test/resources/surefire-1614-stream-corruption/pom.xml
index 25726cb30..2db3d792b 100644
--- a/surefire-its/src/test/resources/surefire-1614-stream-corruption/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1614-stream-corruption/pom.xml
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
- <version>5.3.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1659-stream-corruption/pom.xml b/surefire-its/src/test/resources/surefire-1659-stream-corruption/pom.xml
index 1184931aa..5883ee7bc 100644
--- a/surefire-its/src/test/resources/surefire-1659-stream-corruption/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1659-stream-corruption/pom.xml
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.1</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
index d75fe8e9f..ed6fe609f 100644
--- a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.5.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/src/test/java/module-info.java b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/src/test/java/module-info.java
index 5291a22a1..248c7acf1 100644
--- a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/src/test/java/module-info.java
+++ b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/src/test/java/module-info.java
@@ -21,5 +21,6 @@ open module wtf.g4s8.oot.test
{
requires wtf.g4s8.oot;
requires transitive org.junit.jupiter.engine;
+ requires transitive org.junit.jupiter.api;
requires transitive org.hamcrest;
}
diff --git a/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml b/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
index c309b7f65..5935e4b87 100644
--- a/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1733-junit4/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13</version>
+ <version>4.13.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/surefire-its/src/test/resources/surefire-1881/pom.xml b/surefire-its/src/test/resources/surefire-1881/pom.xml
index 7f7720ae0..40284ac32 100644
--- a/surefire-its/src/test/resources/surefire-1881/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1881/pom.xml
@@ -140,7 +140,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml b/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
index 49896d4ba..9d46d0a46 100644
--- a/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1993-jpms-providing-modules/pom.xml
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
- <version>5.7.1</version>
+ <version>5.9.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/surefire-its/src/test/resources/surefire-2036/pom.xml b/surefire-its/src/test/resources/surefire-2036/pom.xml
index d6106810c..73c7116d5 100644
--- a/surefire-its/src/test/resources/surefire-2036/pom.xml
+++ b/surefire-its/src/test/resources/surefire-2036/pom.xml
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.6.2</version>
+ <version>5.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
- <version>1.6.2</version>
+ <version>1.9.1</version>
<scope>test</scope>
</dependency>
</dependencies>