Fix junit5 dependency version and review Cucumber dependencies (#3216)

serenity-bdd · Aug 22, 2023 · c322594 · c322594
1 parent 1716770
commit c322594
Show file tree

Hide file tree

Showing 27 changed files with 40 additions and 106 deletions.
diff --git a/build.gradle b/build.gradle
@@ -174,13 +174,15 @@ subprojects {
     }
 
     test {
+        useJUnitPlatform()
         testLogging {
             events "failed"//, "passed", "skipped"
             exceptionFormat = 'full'
         }
     }
 
     integrationTests {
+        useJUnitPlatform()
         testLogging {
             events "failed"//, "passed", "skipped"
             exceptionFormat = 'full'

diff --git 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
@@ -33,7 +33,7 @@
         <connection>scm:git:https://github.com/serenity-bdd/serenity-core.git</connection>
         <developerConnection>scm:git:https://github.com/serenity-bdd/serenity-core.git</developerConnection>
         <url>https://github.com/serenity-bdd/serenity-core</url>
-        <tag>3.6.15</tag>
+        <tag>4.0.0-beta-3-SNAPSHOT</tag>
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -275,30 +275,6 @@
                 <artifactId>commons-codec</artifactId>
                 <version>${commons.codec.version}</version>
             </dependency>
-            <!-- Cucumber dependencies -->
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-core</artifactId>
-                <version>${cucumber.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apiguardian</groupId>
-                        <artifactId>apiguardian-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-java</artifactId>
-                <version>${cucumber.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apiguardian</groupId>
-                        <artifactId>apiguardian-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
@@ -316,24 +292,6 @@
             </dependency>
 
             <!-- Testing -->
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-api</artifactId>
-                <version>${junit5.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit5.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit5.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.skyscreamer</groupId>
                 <artifactId>jsonassert</artifactId>
@@ -478,6 +436,24 @@
                 <version>${xchart.version}</version>
             </dependency>
 
+            <!-- BOM should be latest to overwrite versions -->
+
+            <!-- Cucumber -->
+            <dependency>
+                <groupId>io.cucumber</groupId>
+                <artifactId>cucumber-bom</artifactId>
+                <version>${cucumber.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- Junit 5 -->
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit5.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <distributionManagement>

diff --git a/serenity-assertions/pom.xml b/serenity-assertions/pom.xml
@@ -48,7 +48,6 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/serenity-bitbar/pom.xml b/serenity-bitbar/pom.xml
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>

diff --git a/serenity-browserstack/pom.xml b/serenity-browserstack/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>

diff --git a/serenity-cli/pom.xml b/serenity-cli/pom.xml
@@ -117,7 +117,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>

diff --git a/serenity-core/pom.xml b/serenity-core/pom.xml
@@ -360,7 +360,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/serenity-crossbrowsertesting/pom.xml b/serenity-crossbrowsertesting/pom.xml
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/serenity-cucumber/pom.xml b/serenity-cucumber/pom.xml
@@ -69,7 +69,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -92,17 +91,26 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-core</artifactId>
-            <version>${cucumber.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apiguardian</groupId>
+                    <artifactId>apiguardian-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java</artifactId>
-            <version>${cucumber.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apiguardian</groupId>
+                    <artifactId>apiguardian-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
-            <version>${cucumber.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>junit</groupId>
@@ -119,7 +127,6 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-java8</artifactId>
-            <version>${cucumber.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -131,7 +138,6 @@
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>datatable-matchers</artifactId>
-            <version>${cucumber.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -142,6 +148,11 @@
         </dependency>
 
         <!-- TEST DEPENDENCIES -->
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-junit-platform-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
@@ -161,26 +172,21 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-suite-api</artifactId>
-            <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
          <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-suite-engine</artifactId>
-            <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.junit.platform/junit-platform-testkit -->
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-testkit</artifactId>
-            <version>1.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -206,11 +212,5 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-           <groupId>io.cucumber</groupId>
-           <artifactId>cucumber-junit-platform-engine</artifactId>
-           <version>${cucumber.version}</version>
-           <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/serenity-jira-plugin/pom.xml b/serenity-jira-plugin/pom.xml
@@ -227,13 +227,11 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git a/serenity-jira-requirements-provider/pom.xml b/serenity-jira-requirements-provider/pom.xml
@@ -37,14 +37,12 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/serenity-json-summary-report/pom.xml b/serenity-json-summary-report/pom.xml
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/serenity-junit/pom.xml b/serenity-junit/pom.xml
@@ -47,15 +47,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>compile</scope>
         </dependency>
 
         <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>

diff --git 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
@@ -44,19 +44,16 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit5.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -68,7 +65,6 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>1.9.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/serenity-model/pom.xml b/serenity-model/pom.xml
@@ -198,19 +198,16 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/serenity-navigator-report/pom.xml b/serenity-navigator-report/pom.xml
@@ -93,13 +93,11 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>