Implemented junit 5 batching

- Includes fixed cucumber tag expressions dependency

pom.xml

@@ -48,6 +48,7 @@
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>2.0.16</slf4j.version>
         <cucumber.version>7.20.1</cucumber.version>
+        <cucumber.tag-expressions.version>6.1.1</cucumber.tag-expressions.version>
         <gson.version>2.11.0</gson.version>
         <junit5.version>5.11.1</junit5.version>
         <mockito.version>3.3.3</mockito.version>

serenity-cucumber/pom.xml

@@ -212,5 +212,11 @@
             <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.serenity-bdd</groupId>
+            <artifactId>serenity-junit5</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

serenity-cucumber/src/main/java/io/cucumber/junit/CucumberSerenityBaseRunner.java

@@ -1,14 +1,5 @@
 package io.cucumber.junit;
 
-import static io.cucumber.core.runtime.SynchronizedEventBus.synchronize;
-import static io.cucumber.junit.FileNameCompatibleNames.uniqueSuffix;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.toList;
-import static net.thucydides.model.ThucydidesSystemProperty.SERENITY_BATCH_COUNT;
-import static net.thucydides.model.ThucydidesSystemProperty.SERENITY_BATCH_NUMBER;
-import static net.thucydides.model.ThucydidesSystemProperty.SERENITY_FORK_COUNT;
-import static net.thucydides.model.ThucydidesSystemProperty.SERENITY_FORK_NUMBER;
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.feature.FeatureParser;
 import io.cucumber.core.filter.Filters;
@@ -20,25 +11,17 @@
 import io.cucumber.core.resource.ClassLoaders;
 import io.cucumber.core.runtime.*;
 import io.cucumber.plugin.Plugin;
-import io.cucumber.tagexpressions.Expression;
-import java.net.URI;
-import java.time.Clock;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import net.serenitybdd.cucumber.SerenityOptions;
 import net.serenitybdd.cucumber.suiteslicing.CucumberSuiteSlicer;
 import net.serenitybdd.cucumber.suiteslicing.ScenarioFilter;
 import net.serenitybdd.cucumber.suiteslicing.TestStatistics;
 import net.serenitybdd.cucumber.suiteslicing.WeightedCucumberScenarios;
+import io.cucumber.tagexpressions.Expression;
+import net.serenitybdd.cucumber.SerenityOptions;
 import net.serenitybdd.cucumber.util.PathUtils;
 import net.serenitybdd.cucumber.util.Splitter;
+import net.thucydides.core.steps.StepEventBus;
 import net.thucydides.model.ThucydidesSystemProperty;
 import net.thucydides.model.environment.SystemEnvironmentVariables;
-import net.thucydides.core.steps.StepEventBus;
-import net.thucydides.model.requirements.reports.MultipleSourceRequirmentsOutcomeFactory;
 import net.thucydides.model.util.EnvironmentVariables;
 import org.junit.runner.Description;
 import org.junit.runner.manipulation.NoTestsRemainException;
@@ -50,6 +33,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.URI;
+import java.time.Clock;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static io.cucumber.core.runtime.SynchronizedEventBus.synchronize;
+import static io.cucumber.junit.FileNameCompatibleNames.uniqueSuffix;
+import static java.util.Arrays.stream;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+import static net.thucydides.model.ThucydidesSystemProperty.*;
+
 public class CucumberSerenityBaseRunner extends ParentRunner<ParentRunner<?>> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CucumberSerenityBaseRunner.class);