From d3dafe4d36b6dd981c399dd816111762213186f3 Mon Sep 17 00:00:00 2001 From: "Pabst, Andreas" Date: Thu, 29 Dec 2022 18:27:56 +0100 Subject: [PATCH] [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 --- .../its/JUnit4RerunFailingTestsIT.java | 42 ++++++++++--------- .../maven/surefire/its/JUnit4VersionsIT.java | 6 ++- .../its/JUnitPlatformRerunFailingTestsIT.java | 2 +- .../maven/surefire/its/JUnitVersion.java | 4 +- .../assumpationFailureReport/pom.xml | 2 +- .../src/test/resources/java9-full-api/pom.xml | 2 +- .../src/test/resources/junit-4-5/pom.xml | 24 +++++------ .../src/test/resources/junit4/pom.xml | 2 +- .../test/resources/junit5-modulepath/pom.xml | 2 +- .../src/test/resources/junit5-runner/pom.xml | 4 +- .../src/test/resources/junit5-spock/pom.xml | 2 +- .../pom.xml | 2 +- .../src/test/resources/runOrder/pom.xml | 2 +- .../pom.xml | 2 +- .../src/test/resources/surefire-1570/pom.xml | 2 +- .../surefire-1585-junit4-vintage/pom.xml | 4 +- .../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 + .../resources/surefire-1733-junit4/pom.xml | 2 +- .../src/test/resources/surefire-1881/pom.xml | 2 +- .../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 aff6c176a9..3903dd431c 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 @@ 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 @@ private SurefireLauncher unpack() 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 void testRerunFailingErrorTestsTwoRetry() { // 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 void testRerunFailingErrorTestsTwoRetry() 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 void testRerunFailingErrorTestsFalse() 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 void testRerunOneTestClass() 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 void testRerunOneTestMethod() 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 697b449bf8..f907152a4b 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_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 static Collection junitVersions() { 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 93a475942e..4b99a8a24a 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 @@ @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 69f43538c9..e63b5c11e0 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 6dd3626516..2eb5f87bd3 100644 --- a/surefire-its/src/test/resources/assumpationFailureReport/pom.xml +++ b/surefire-its/src/test/resources/assumpationFailureReport/pom.xml @@ -39,7 +39,7 @@ junit junit - 4.13 + 4.13.2 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 562f94fcb7..ec08999fb3 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 @@ junit junit - 4.13 + 4.13.2 test 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 5f6a5a4f0a..f202a4c962 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 test org.junit.vintage junit-vintage-engine - 5.6.2 + 5.9.1 test @@ -69,13 +69,13 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 + 5.9.1 test org.junit.vintage junit-vintage-engine - 5.6.2 + 5.9.1 test @@ -86,13 +86,13 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 + 5.9.1 test junit junit - 4.13 + 4.13.2 test @@ -103,13 +103,13 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 + 5.9.1 test junit junit - 4.13 + 4.13.2 test @@ -122,7 +122,7 @@ org.junit.vintage junit-vintage-engine - 5.6.2 + 5.9.1 @@ -135,13 +135,13 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 + 5.9.1 test junit junit - 4.13 + 4.13.2 test @@ -154,7 +154,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 diff --git a/surefire-its/src/test/resources/junit4/pom.xml b/surefire-its/src/test/resources/junit4/pom.xml index 561345873b..f795955ef9 100644 --- a/surefire-its/src/test/resources/junit4/pom.xml +++ b/surefire-its/src/test/resources/junit4/pom.xml @@ -28,7 +28,7 @@ Test for JUnit 4 - 4.13 + 4.13.2 1.7 1.7 diff --git a/surefire-its/src/test/resources/junit5-modulepath/pom.xml b/surefire-its/src/test/resources/junit5-modulepath/pom.xml index c997bd0cd4..fbb12843b5 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 test diff --git a/surefire-its/src/test/resources/junit5-runner/pom.xml b/surefire-its/src/test/resources/junit5-runner/pom.xml index c667e030f6..ee78e7aa97 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 test org.junit.platform junit-platform-runner - 1.6.2 + 1.9.1 test diff --git a/surefire-its/src/test/resources/junit5-spock/pom.xml b/surefire-its/src/test/resources/junit5-spock/pom.xml index feb7e1d497..c90d0ff637 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 test 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 00e047f58a..c2537ebb12 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 diff --git a/surefire-its/src/test/resources/runOrder/pom.xml b/surefire-its/src/test/resources/runOrder/pom.xml index 5bfad1487e..012da053df 100644 --- a/surefire-its/src/test/resources/runOrder/pom.xml +++ b/surefire-its/src/test/resources/runOrder/pom.xml @@ -66,7 +66,7 @@ org.junit.vintage junit-vintage-engine - 5.5.2 + 5.9.1 test 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 0f5d354735..ebb01461bd 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 @@ UTF-8 ${java.specification.version} - 5.3.2 + 5.9.1 diff --git a/surefire-its/src/test/resources/surefire-1570/pom.xml b/surefire-its/src/test/resources/surefire-1570/pom.xml index 0f6bc9a2f9..9943f8ddb3 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 @@ org.junit.jupiter junit-jupiter-api - 5.6.2 + 5.9.1 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 7bdf148434..a39d59568e 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 @@ 1.8 1.8 - 5.4.0 + 5.9.1 junit junit - 4.12 + 4.13.2 test 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 652ae493b3..de46af0e8e 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 @@ 1.8 1.8 - 5.4.0 + 5.9.1 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 25726cb30c..2db3d792b5 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 @@ org.junit.vintage junit-vintage-engine - 5.3.2 + 5.9.1 test 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 1184931aa0..5883ee7bc3 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 @@ org.junit.jupiter junit-jupiter-engine - 5.7.1 + 5.9.1 test 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 d75fe8e9fe..ed6fe609f6 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 @@ org.junit.jupiter junit-jupiter-engine - 5.5.2 + 5.9.1 test 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 5291a22a1e..248c7acf11 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 @@ { 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 c309b7f653..5935e4b874 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 @@ junit junit - 4.13 + 4.13.2 test diff --git a/surefire-its/src/test/resources/surefire-1881/pom.xml b/surefire-its/src/test/resources/surefire-1881/pom.xml index 7f7720ae0e..40284ac32d 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 @@ junit junit - 4.13.1 + 4.13.2 test 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 49896d4bac..9d46d0a467 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 @@ org.junit junit-bom - 5.7.1 + 5.9.1 pom import diff --git a/surefire-its/src/test/resources/surefire-2036/pom.xml b/surefire-its/src/test/resources/surefire-2036/pom.xml index d6106810c0..73c7116d53 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 @@ org.junit.jupiter junit-jupiter-engine - 5.6.2 + 5.9.1 test org.junit.platform junit-platform-runner - 1.6.2 + 1.9.1 test