Bump serenity.version from 3.9.8 to 4.0.1 (#814)

build-monitor-acceptance/pom.xml

@@ -13,7 +13,7 @@
 
   <properties>
     <byte-buddy.version>1.14.7</byte-buddy.version>
-    <serenity.version>3.9.8</serenity.version>
+    <serenity.version>4.0.1</serenity.version>
     <slf4j.version>2.0.9</slf4j.version>
   </properties>
 
@@ -41,6 +41,16 @@
         <artifactId>xstream</artifactId>
         <version>1.4.20</version>
       </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.16.0</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.13.0</version>
+      </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>

build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java

@@ -3,10 +3,10 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.cloudbees.hudson.plugins.folder.tasks.CreateAFolder;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
-import net.thucydides.core.annotations.Step;
 
 public class HaveAFolderCreated implements Task {
 

build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java

@@ -3,11 +3,11 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.cloudbees.hudson.plugins.folder.user_interface.FolderDetailsPage;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.tasks.CreateAFreestyleProject;
-import net.thucydides.core.annotations.Step;
 
 public class HaveANestedProjectCreated implements Task {
 

build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java

@@ -2,6 +2,7 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
@@ -10,7 +11,6 @@
 import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel;
-import net.thucydides.core.annotations.Step;
 import org.openqa.selenium.Keys;
 
 public class CreateAFolder implements Task {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java

@@ -3,10 +3,10 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
-import net.thucydides.core.annotations.Step;
 
 public class AddProjects implements Task {
     public static Task toAnEmptyBuildMonitor() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java

@@ -4,11 +4,11 @@
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor;
 import java.util.List;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
-import net.thucydides.core.annotations.Step;
 
 public class ConfigureEmptyBuildMonitorView implements Task {
 

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java

@@ -3,6 +3,7 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
@@ -11,7 +12,6 @@
 import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage;
 import net.serenitybdd.screenplay.jenkins.user_interface.NewViewPage;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons;
-import net.thucydides.core.annotations.Step;
 
 public class CreateABuildMonitorView implements Task {
     public static CreateABuildMonitorView called(String name) {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java

@@ -3,9 +3,9 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayAllProjects;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
-import net.thucydides.core.annotations.Step;
 
 public class HaveABuildMonitorViewCreated implements Task {
     public static Task showingAllTheProjects() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java

@@ -3,12 +3,12 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.UncheckCheckbox;
 import net.serenitybdd.screenplay.matchers.WebElementStateMatchers;
 import net.serenitybdd.screenplay.waits.WaitUntil;
-import net.thucydides.core.annotations.Step;
 
 public class HideBadges implements Task {
     public static Task onTheDashboard() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java

@@ -4,12 +4,12 @@
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
 import java.util.List;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
-import net.thucydides.core.annotations.Step;
 
 public class ModifyControlPanelOptions implements Task {
 

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java

@@ -3,12 +3,12 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.CheckCheckbox;
 import net.serenitybdd.screenplay.matchers.WebElementStateMatchers;
 import net.serenitybdd.screenplay.waits.WaitUntil;
-import net.thucydides.core.annotations.Step;
 
 public class ShowBadges implements Task {
     public static Task onTheDashboard() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java

@@ -4,13 +4,13 @@
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.Sleep;
 import java.util.concurrent.TimeUnit;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplay.targets.Target;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class ConfigureViewSettings implements Task {
 

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java

@@ -4,13 +4,13 @@
 
 import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.Sleep;
 import java.util.concurrent.TimeUnit;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.actions.Enter;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class DisplayAllProjects implements Task {
     public static Task usingARegularExpression() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.SelectFromOptions;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class DisplayBadges implements Task {
     public static DisplayBadges asAUserSetting() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.SelectFromOptions;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class DisplayBadgesFrom implements Task {
     public static DisplayBadgesFrom theLastBuild() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.CheckCheckbox;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class DisplayJunitRealtimeProgress implements Task {
     public static Task bars() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.actions.Choose;
 import net.serenitybdd.screenplay.jenkins.user_interface.ViewConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class DisplayNestedProjects implements Task {
     public static Task fromSubfolders() {

build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java

@@ -2,11 +2,11 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons;
-import net.thucydides.core.annotations.Step;
 
 public class SaveTheChangesToBuildMonitor implements Task {
     public static Task andExitTheConfigurationScreen() {

build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java

@@ -4,10 +4,10 @@
 
 import com.sonyericsson.jenkins.plugins.bfa.tasks.DefineAFailureCause;
 import com.sonyericsson.jenkins.plugins.bfa.tasks.configuration.LineInTheBuildLog;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.integration.utils.Nulls;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
-import net.thucydides.core.annotations.Step;
 
 public class DefineABuildLogIndicatedFailureCause implements Task {
 

build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java

@@ -4,12 +4,12 @@
 
 import com.sonyericsson.jenkins.plugins.bfa.user_interface.JenkinsHomePageWithBFA;
 import java.util.List;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList;
 import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Breadcrumbs;
-import net.thucydides.core.annotations.Step;
 
 public class UseFailureCauseManagement implements Task {
     public static UseFailureCauseManagement to(Task... defineFailureCauses) {

build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java

@@ -3,14 +3,14 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import com.sonyericsson.jenkins.plugins.bfa.user_interface.FailureCauseManagementPage;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.actions.Enter;
 import net.serenitybdd.screenplay.matchers.WebElementStateMatchers;
 import net.serenitybdd.screenplay.waits.WaitUntil;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class LineInTheBuildLog implements Task {
     public static LineInTheBuildLog matching(String pattern) {

build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java

@@ -3,13 +3,13 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import hudson.plugins.claim.tasks.configuration.BrokenBuildClaiming;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.HaveAProjectCreated;
 import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat;
-import net.thucydides.core.annotations.Step;
 
 public class HaveAFailingClaimableProjectCreated implements Task {
     public static Task called(String name) {

build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java

@@ -3,14 +3,14 @@
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
 import hudson.plugins.claim.user_interface.ClaimableBuildDetailsPage;
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Click;
 import net.serenitybdd.screenplay.actions.Enter;
 import net.serenitybdd.screenplay.jenkins.targets.Link;
 import net.serenitybdd.screenplay.jenkins.user_interface.ProjectDetailsPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
-import net.thucydides.core.annotations.Step;
 
 public class Claim implements Task {
     public static Claim lastBrokenBuildOf(String project) {

build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java

@@ -2,10 +2,10 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.AddAPostBuildAction;
-import net.thucydides.core.annotations.Step;
 
 public class BrokenBuildClaiming implements Task {
 

build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.actions.Enter;
 import net.serenitybdd.screenplay.jenkins.targets.Input;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.AddABuildStep;
-import net.thucydides.core.annotations.Step;
 
 public class SetBuildDescription implements Task {
 

build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java

@@ -1,9 +1,9 @@
 package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Interaction;
 import net.serenitybdd.screenplay.interacting_with_jenkins_api.abilities.InteractWithJenkinsAPI;
-import net.thucydides.core.annotations.Step;
 
 class NotifyOfExternalProjectFailure implements Interaction {
     @Override

build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java

@@ -1,9 +1,9 @@
 package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Interaction;
 import net.serenitybdd.screenplay.interacting_with_jenkins_api.abilities.InteractWithJenkinsAPI;
-import net.thucydides.core.annotations.Step;
 
 class NotifyOfExternalProjectSuccess implements Interaction {
     @Override

build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java

@@ -2,12 +2,12 @@
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
+import net.serenitybdd.annotations.Step;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Task;
 import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript;
 import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat;
-import net.thucydides.core.annotations.Step;
 
 public class HaveAFailingProjectCreated implements Task {