diff --git a/build.gradle b/build.gradle index 04d74ca79..2b96b74fe 100644 --- a/build.gradle +++ b/build.gradle @@ -174,6 +174,7 @@ subprojects { } test { + useJUnitPlatform() testLogging { events "failed"//, "passed", "skipped" exceptionFormat = 'full' @@ -181,6 +182,7 @@ subprojects { } integrationTests { + useJUnitPlatform() testLogging { events "failed"//, "passed", "skipped" exceptionFormat = 'full' diff --git a/gradle.properties b/gradle.properties index 62ad61940..4d1ec3046 100644 --- a/gradle.properties +++ b/gradle.properties @@ -76,8 +76,7 @@ spockVersion=2.2-M1-groovy-4.0 spockExtensionsVersion=0.1.4 assertjVersion=3.22.0 jsonassertVersion=1.5.0 -junit5Version=5.8.2 -junitPlatformLauncher=1.8.1 +junit5Version=5.10.0 opentest4jVersion=1.2.0 # Bintray configuration bintrayBaseUrl=https://api.bintray.com/maven diff --git a/pom.xml b/pom.xml index 156e82d87..908c70328 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/serenity-bdd/serenity-core.git scm:git:https://github.com/serenity-bdd/serenity-core.git https://github.com/serenity-bdd/serenity-core - 3.6.15 + 4.0.0-beta-3-SNAPSHOT UTF-8 @@ -275,30 +275,6 @@ commons-codec ${commons.codec.version} - - - io.cucumber - cucumber-core - ${cucumber.version} - - - org.apiguardian - apiguardian-api - - - - - io.cucumber - cucumber-java - ${cucumber.version} - - - org.apiguardian - apiguardian-api - - - - com.google.code.gson gson @@ -316,24 +292,6 @@ - - org.junit.jupiter - junit-jupiter-api - ${junit5.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit5.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit5.version} - test - org.skyscreamer jsonassert @@ -478,6 +436,24 @@ ${xchart.version} + + + + + io.cucumber + cucumber-bom + ${cucumber.version} + pom + import + + + + org.junit + junit-bom + ${junit5.version} + pom + import + diff --git a/serenity-assertions/pom.xml b/serenity-assertions/pom.xml index fa3731ed9..fcb1c7c48 100644 --- a/serenity-assertions/pom.xml +++ b/serenity-assertions/pom.xml @@ -48,7 +48,6 @@ org.assertj assertj-core - ${assertj.version} compile diff --git a/serenity-bitbar/pom.xml b/serenity-bitbar/pom.xml index f6a44382a..78bcf6f4c 100644 --- a/serenity-bitbar/pom.xml +++ b/serenity-bitbar/pom.xml @@ -58,7 +58,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} true test diff --git a/serenity-browserstack/pom.xml b/serenity-browserstack/pom.xml index 90b73819c..d4bd04c42 100644 --- a/serenity-browserstack/pom.xml +++ b/serenity-browserstack/pom.xml @@ -56,7 +56,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} true test diff --git a/serenity-cli/pom.xml b/serenity-cli/pom.xml index 134c126b3..22699326e 100644 --- a/serenity-cli/pom.xml +++ b/serenity-cli/pom.xml @@ -117,7 +117,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test true diff --git a/serenity-core/pom.xml b/serenity-core/pom.xml index 753796bde..fb5ca3905 100644 --- a/serenity-core/pom.xml +++ b/serenity-core/pom.xml @@ -360,7 +360,6 @@ org.junit.jupiter junit-jupiter-params - ${junit5.version} test diff --git a/serenity-crossbrowsertesting/pom.xml b/serenity-crossbrowsertesting/pom.xml index fc557afe6..512724572 100644 --- a/serenity-crossbrowsertesting/pom.xml +++ b/serenity-crossbrowsertesting/pom.xml @@ -47,7 +47,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} true diff --git a/serenity-cucumber/pom.xml b/serenity-cucumber/pom.xml index e68a7a0a8..fd017b691 100644 --- a/serenity-cucumber/pom.xml +++ b/serenity-cucumber/pom.xml @@ -69,7 +69,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} compile true @@ -92,17 +91,26 @@ io.cucumber cucumber-core - ${cucumber.version} + + + org.apiguardian + apiguardian-api + + io.cucumber cucumber-java - ${cucumber.version} + + + org.apiguardian + apiguardian-api + + io.cucumber cucumber-junit - ${cucumber.version} junit @@ -119,7 +127,6 @@ io.cucumber cucumber-java8 - ${cucumber.version} test @@ -131,7 +138,6 @@ io.cucumber datatable-matchers - ${cucumber.version} test @@ -142,6 +148,11 @@ + + io.cucumber + cucumber-junit-platform-engine + test + org.assertj assertj-core @@ -161,26 +172,21 @@ org.junit.platform junit-platform-launcher - 1.8.2 test org.junit.platform junit-platform-suite-api - 1.8.2 test org.junit.platform junit-platform-suite-engine - 1.8.2 test - org.junit.platform junit-platform-testkit - 1.8.2 test @@ -206,11 +212,5 @@ ${spring.version} test - - io.cucumber - cucumber-junit-platform-engine - ${cucumber.version} - test - diff --git a/serenity-jira-plugin/pom.xml b/serenity-jira-plugin/pom.xml index 2a692c125..2fd6f7928 100644 --- a/serenity-jira-plugin/pom.xml +++ b/serenity-jira-plugin/pom.xml @@ -227,13 +227,11 @@ junit junit - 4.11 test org.junit.jupiter junit-jupiter-engine - ${junit5.version} compile true diff --git a/serenity-jira-requirements-provider/pom.xml b/serenity-jira-requirements-provider/pom.xml index 30efe37bb..a493aca65 100644 --- a/serenity-jira-requirements-provider/pom.xml +++ b/serenity-jira-requirements-provider/pom.xml @@ -37,14 +37,12 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} compile true junit junit - 4.11 test diff --git a/serenity-json-summary-report/pom.xml b/serenity-json-summary-report/pom.xml index 8775c59ae..ac0ec5834 100644 --- a/serenity-json-summary-report/pom.xml +++ b/serenity-json-summary-report/pom.xml @@ -47,7 +47,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test diff --git a/serenity-junit/pom.xml b/serenity-junit/pom.xml index 73c159b3f..f1de256e6 100644 --- a/serenity-junit/pom.xml +++ b/serenity-junit/pom.xml @@ -47,7 +47,6 @@ junit junit - ${junit.version} compile @@ -55,7 +54,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} compile true diff --git a/serenity-junit5/build.gradle b/serenity-junit5/build.gradle index 567946605..dcd1130a3 100644 --- a/serenity-junit5/build.gradle +++ b/serenity-junit5/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation "org.junit.jupiter:junit-jupiter-engine:${junit5Version}" implementation "org.junit.jupiter:junit-jupiter-params:${junit5Version}" implementation "org.junit.vintage:junit-vintage-engine:${junit5Version}" - implementation "org.junit.platform:junit-platform-launcher:1.8.1" + implementation "org.junit.platform:junit-platform-launcher" implementation "junit:junit:${junitVersion}" implementation("org.spockframework:spock-core:${spockVersion}") { exclude group:'org.junit.platform', module:'junit-platform-engine' diff --git a/serenity-junit5/pom.xml b/serenity-junit5/pom.xml index a37d1cbe2..0c7ba9838 100644 --- a/serenity-junit5/pom.xml +++ b/serenity-junit5/pom.xml @@ -44,19 +44,16 @@ org.junit.jupiter junit-jupiter-api - ${junit5.version} compile org.junit.jupiter junit-jupiter-engine - ${junit5.version} compile org.junit.jupiter junit-jupiter-params - ${junit5.version} compile @@ -68,7 +65,6 @@ org.junit.platform junit-platform-launcher - 1.9.0 compile diff --git a/serenity-model/pom.xml b/serenity-model/pom.xml index 31ec115c7..290275390 100644 --- a/serenity-model/pom.xml +++ b/serenity-model/pom.xml @@ -198,19 +198,16 @@ junit junit - ${junit.version} test org.junit.jupiter junit-jupiter-engine - ${junit5.version} test org.junit.vintage junit-vintage-engine - ${junit5.version} test diff --git a/serenity-navigator-report/pom.xml b/serenity-navigator-report/pom.xml index 706b902af..7f2b708d6 100644 --- a/serenity-navigator-report/pom.xml +++ b/serenity-navigator-report/pom.xml @@ -93,13 +93,11 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test org.junit.vintage junit-vintage-engine - ${junit5.version} test diff --git a/serenity-reports-configuration/pom.xml b/serenity-reports-configuration/pom.xml index c13640e26..c3c3978b9 100644 --- a/serenity-reports-configuration/pom.xml +++ b/serenity-reports-configuration/pom.xml @@ -25,21 +25,14 @@ - - - - - org.junit.jupiter junit-jupiter-api - ${junit5.version} test org.junit.jupiter junit-jupiter-engine - ${junit5.version} test diff --git a/serenity-reports/pom.xml b/serenity-reports/pom.xml index e7a12c828..660ffe90c 100644 --- a/serenity-reports/pom.xml +++ b/serenity-reports/pom.xml @@ -98,13 +98,11 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test org.junit.vintage junit-vintage-engine - ${junit5.version} test diff --git a/serenity-rest-assured/pom.xml b/serenity-rest-assured/pom.xml index 62630d120..c28bd80b7 100644 --- a/serenity-rest-assured/pom.xml +++ b/serenity-rest-assured/pom.xml @@ -111,19 +111,16 @@ org.junit.jupiter junit-jupiter-api - ${junit5.version} test org.junit.vintage junit-vintage-engine - ${junit5.version} test org.junit.jupiter junit-jupiter-params - ${junit5.version} test diff --git a/serenity-saucelabs/pom.xml b/serenity-saucelabs/pom.xml index b051508fa..8d6d80948 100644 --- a/serenity-saucelabs/pom.xml +++ b/serenity-saucelabs/pom.xml @@ -50,7 +50,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} true diff --git a/serenity-screenplay-playwright/pom.xml b/serenity-screenplay-playwright/pom.xml index 6ba7a0457..ddb3d597a 100644 --- a/serenity-screenplay-playwright/pom.xml +++ b/serenity-screenplay-playwright/pom.xml @@ -74,13 +74,11 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test org.junit.vintage junit-vintage-engine - ${junit5.version} test diff --git a/serenity-shutterbug/pom.xml b/serenity-shutterbug/pom.xml index af1d676b8..44de6e491 100644 --- a/serenity-shutterbug/pom.xml +++ b/serenity-shutterbug/pom.xml @@ -39,7 +39,6 @@ junit junit - ${junit.version} test diff --git a/serenity-single-page-report/pom.xml b/serenity-single-page-report/pom.xml index e2f95c0ea..75764f5cb 100644 --- a/serenity-single-page-report/pom.xml +++ b/serenity-single-page-report/pom.xml @@ -83,7 +83,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test diff --git a/serenity-smoketests/pom.xml b/serenity-smoketests/pom.xml index ef3d237f3..232f4a840 100644 --- a/serenity-smoketests/pom.xml +++ b/serenity-smoketests/pom.xml @@ -62,18 +62,15 @@ org.slf4j slf4j-simple - 1.7.30 junit junit - 4.13.1 test org.assertj assertj-core - 3.24.2 diff --git a/serenity-stats/pom.xml b/serenity-stats/pom.xml index c5f82956b..09f5303a0 100644 --- a/serenity-stats/pom.xml +++ b/serenity-stats/pom.xml @@ -39,7 +39,6 @@ org.junit.jupiter junit-jupiter-engine - ${junit5.version} test