From 88ce56045c9a247643f12913969069c40e7a8c69 Mon Sep 17 00:00:00 2001
From: John Ferguson Smart <john.smart@wakaleo.com>
Date: Sun, 19 May 2024 09:52:34 +0100
Subject: [PATCH] Updated dependency versions including Selenium 4.21.0

---
 pom.xml                                            | 14 +++++++-------
 .../core/plugin/SerenityReporterParallel.java      | 10 ++++++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34055516a..c073fcaa6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <junit.version>4.13.2</junit.version>
         <groovy.version>4.0.13</groovy.version>
         <spock.version>2.4-M1-groovy-4.0</spock.version>
-        <byte-buddy.version>1.14.14</byte-buddy.version>
+        <byte-buddy.version>1.14.15</byte-buddy.version>
         <guava.version>33.1.0-jre</guava.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>2.0.9</slf4j.version>
@@ -63,8 +63,8 @@
         <commons.net.version>3.10.0</commons.net.version>
         <commons.codec.version>1.16.1</commons.codec.version>
         <freemarker.version>2.3.32</freemarker.version>
-        <selenium.version>4.20.0</selenium.version>
-        <htmlunit.driver.version>4.20.0</htmlunit.driver.version>
+        <selenium.version>4.21.0</selenium.version>
+        <htmlunit.driver.version>4.21.0</htmlunit.driver.version>
         <jsonassert.version>1.5.1</jsonassert.version>
         <jsoup.version>1.15.4</jsoup.version>
         <joda-time.version>2.12.7</joda-time.version>
@@ -76,11 +76,11 @@
         <freemarker.version>2.3.32</freemarker.version>
         <appium.version>9.2.2</appium.version>
         <fluentlenium.version>0.10.2</fluentlenium.version>
-        <htmlunit.version>4.0.0</htmlunit.version>
+        <htmlunit.version>4.1.0</htmlunit.version>
         <filters.version>2.0.235</filters.version>
         <ngwebdriver.version>1.1.6</ngwebdriver.version>
-        <spring.version>5.3.29</spring.version>
-        <spring.boot.version>2.7.14</spring.boot.version>
+        <spring.version>6.1.7</spring.version>
+        <spring.boot.version>3.2.5</spring.boot.version>
         <jimfs.version>1.3.0</jimfs.version>
         <jbehave.version>4.8.3</jbehave.version>
         <ant.version>1.10.12</ant.version>
@@ -92,7 +92,7 @@
         <xchart.version>3.5.2</xchart.version>
         <ehcache.version>3.10.8</ehcache.version>
         <!-- Kotlin config -->
-        <kotlin.version>1.9.23</kotlin.version>
+        <kotlin.version>1.9.24</kotlin.version>
         <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
     </properties>
     <dependencyManagement>
diff --git a/serenity-cucumber/src/main/java/io/cucumber/core/plugin/SerenityReporterParallel.java b/serenity-cucumber/src/main/java/io/cucumber/core/plugin/SerenityReporterParallel.java
index 09602529c..8b2bdef65 100644
--- a/serenity-cucumber/src/main/java/io/cucumber/core/plugin/SerenityReporterParallel.java
+++ b/serenity-cucumber/src/main/java/io/cucumber/core/plugin/SerenityReporterParallel.java
@@ -784,7 +784,10 @@ private void startScenario(String scenarioId, URI featurePath, TestCase testCase
         LOGGER.debug("SRP:startScenario" + " " + featurePath + " "
                 + Thread.currentThread() + " " + testCase.getId() + " at line " + testCase.getLocation().getLine());
 
-        reinitializeRemoteWebDriver();
+        RestartBrowserForEach restartBrowserForEach = RestartBrowserForEach.configuredIn(SerenityInfrastructure.getEnvironmentVariables());
+        if (restartBrowserForEach.restartBrowserForANew(RestartBrowserForEach.SCENARIO)) {
+            reinitializeRemoteWebDriver();
+        }
 
         context.addHighPriorityStepEventBusEvent(scenarioId,
                 new TestStartedEvent(scenarioId,
@@ -923,7 +926,10 @@ private void startProcessingExampleLine(String scenarioId, URI featurePath, Test
         getContext(featurePath).addStepEventBusEvent(
                 new ClearStepFailuresEvent());
 
-        reinitializeRemoteWebDriver();
+        RestartBrowserForEach restartBrowserForEach = RestartBrowserForEach.configuredIn(SerenityInfrastructure.getEnvironmentVariables());
+        if (restartBrowserForEach.restartBrowserForANew(RestartBrowserForEach.EXAMPLE)) {
+            reinitializeRemoteWebDriver();
+        }
 
         getContext(featurePath).addStepEventBusEvent(
                 new ExampleStartedEvent(data, scenarioName));