From 433b84636629e3ea552c5e4a7f04d969a70f16e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 19:40:03 +0000 Subject: [PATCH] Bump serenity.version from 3.9.8 to 4.0.1 (#814) --- build-monitor-acceptance/pom.xml | 12 +++++++++++- .../hudson/plugins/folder/HaveAFolderCreated.java | 2 +- .../plugins/folder/HaveANestedProjectCreated.java | 2 +- .../hudson/plugins/folder/tasks/CreateAFolder.java | 2 +- .../plugins/build_monitor/tasks/AddProjects.java | 2 +- .../tasks/ConfigureEmptyBuildMonitorView.java | 2 +- .../build_monitor/tasks/CreateABuildMonitorView.java | 2 +- .../tasks/HaveABuildMonitorViewCreated.java | 2 +- .../plugins/build_monitor/tasks/HideBadges.java | 2 +- .../tasks/ModifyControlPanelOptions.java | 2 +- .../plugins/build_monitor/tasks/ShowBadges.java | 2 +- .../tasks/configuration/ConfigureViewSettings.java | 2 +- .../tasks/configuration/DisplayAllProjects.java | 2 +- .../tasks/configuration/DisplayBadges.java | 2 +- .../tasks/configuration/DisplayBadgesFrom.java | 2 +- .../configuration/DisplayJunitRealtimeProgress.java | 2 +- .../tasks/configuration/DisplayNestedProjects.java | 2 +- .../configuration/SaveTheChangesToBuildMonitor.java | 2 +- .../bfa/DefineABuildLogIndicatedFailureCause.java | 2 +- .../plugins/bfa/UseFailureCauseManagement.java | 2 +- .../bfa/tasks/configuration/LineInTheBuildLog.java | 2 +- .../claim/HaveAFailingClaimableProjectCreated.java | 2 +- .../main/java/hudson/plugins/claim/tasks/Claim.java | 2 +- .../tasks/configuration/BrokenBuildClaiming.java | 2 +- .../descriptionsetter/tasks/SetBuildDescription.java | 2 +- .../interactions/NotifyOfExternalProjectFailure.java | 2 +- .../interactions/NotifyOfExternalProjectSuccess.java | 2 +- .../jenkins/HaveAFailingProjectCreated.java | 2 +- .../jenkins/HaveAPipelineProjectCreated.java | 2 +- .../screenplay/jenkins/HaveAProjectCreated.java | 2 +- .../jenkins/HaveASuccessfulProjectCreated.java | 2 +- .../jenkins/HaveAnExternalProjectCreated.java | 2 +- .../screenplay/jenkins/actions/EnterCode.java | 2 +- .../jenkins/tasks/CreateAFreestyleProject.java | 2 +- .../jenkins/tasks/CreateAPipelineProject.java | 2 +- .../screenplay/jenkins/tasks/CreateAProject.java | 2 +- .../jenkins/tasks/CreateAnExternalProject.java | 2 +- .../serenitybdd/screenplay/jenkins/tasks/GoBack.java | 2 +- .../serenitybdd/screenplay/jenkins/tasks/LogIn.java | 2 +- .../screenplay/jenkins/tasks/ScheduleABuild.java | 2 +- .../configuration/build_steps/AddABuildStep.java | 2 +- .../build_steps/AddAGroovyPostbuildScript.java | 2 +- .../build_steps/AddAPostBuildAction.java | 2 +- .../DisableExecutingConcurrentBuilds.java | 2 +- .../build_steps/EnableExecutingConcurrentBuilds.java | 2 +- .../build_steps/ExecuteAShellScript.java | 2 +- .../build_steps/SetPipelineDefinition.java | 2 +- .../jenkins/user_interface/NewJobPage.java | 2 +- .../jenkins/user_interface/NewViewPage.java | 2 +- .../java/features/BuildMonitorAcceptanceTest.java | 2 +- .../features/BuildMonitorShouldBeEasyToSetUp.java | 2 +- 51 files changed, 61 insertions(+), 51 deletions(-) diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml index c540f8343..e9bbf01ac 100644 --- a/build-monitor-acceptance/pom.xml +++ b/build-monitor-acceptance/pom.xml @@ -13,7 +13,7 @@ 1.14.7 - 3.9.8 + 4.0.1 2.0.9 @@ -41,6 +41,16 @@ xstream 1.4.20 + + commons-codec + commons-codec + 1.16.0 + + + commons-io + commons-io + 2.13.0 + net.bytebuddy byte-buddy diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java index bdca42c6e..0aaa6a65d 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java index 1d90d5649..936fd148c 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java index 58e645c68..f9403b9b6 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java index 92535a0cc..86d2fb47a 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java index cf65ef178..08fca0e57 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java index 5d1fb2305..2b91065ee 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java +++ b/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) { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java index a2bc07fd4..2c3f52d4b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java index 58365678c..9a007425d 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java index e45d75823..e4c5a2bfb 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java index f12b7823d..c3766fe68 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java index 175006c7c..2cbd87a8c 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java index 04be42ba7..d214cea98 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java index 1ca738497..c225b0e53 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java index a464c8caa..cdccf11a7 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java index dc964fbae..b551d0bd3 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java index bdcda53df..3351d782b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java index fb8c09f0b..affd137af 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java +++ b/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() { diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java index a74a236d6..bf13dc81f 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java index 9a62e6f02..86cc140d5 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java +++ b/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) { diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java index 4008991fd..b83388332 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java @@ -3,6 +3,7 @@ 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; @@ -10,7 +11,6 @@ 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) { diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java index add9dede4..df1b5cea0 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java +++ b/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) { diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java index 70740c604..112f0f493 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java +++ b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java @@ -3,6 +3,7 @@ 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; @@ -10,7 +11,6 @@ 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) { diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java index d4a1c6b27..d8afe8a5e 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java b/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java index d726f105b..860414ba4 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java index 37e69d8f0..08e4eda94 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectFailure.java +++ b/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 diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java index 61946ccf2..2d25476b1 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProjectSuccess.java +++ b/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 diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java index 9b28d0ac0..240617538 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java +++ b/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 { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java index 9f06b2e1f..d83c2bbf6 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java @@ -2,13 +2,13 @@ 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.tasks.CreateAPipelineProject; import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; -import net.thucydides.core.annotations.Step; public class HaveAPipelineProjectCreated implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java index 2a48e81c4..56e7f28b3 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java @@ -2,13 +2,13 @@ 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.tasks.CreateAFreestyleProject; import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; -import net.thucydides.core.annotations.Step; public class HaveAProjectCreated implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java index b1b3531b4..6ca2c12dd 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.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 HaveASuccessfulProjectCreated implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java index 7c96fe316..1ee4bb4bf 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.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.Click; import net.serenitybdd.screenplay.jenkins.tasks.CreateAnExternalProject; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; -import net.thucydides.core.annotations.Step; public class HaveAnExternalProjectCreated implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java index 2e652c669..28236f0fa 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java @@ -3,12 +3,12 @@ import static net.serenitybdd.screenplay.Tasks.instrumented; import java.util.List; +import net.serenitybdd.annotations.Step; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.targets.Target; import net.serenitybdd.screenplayx.actions.Evaluate; -import net.thucydides.core.annotations.Step; public class EnterCode { public static EnterCode asFollows(String... lines) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java index 20b070971..5454ffcea 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.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.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; -import net.thucydides.core.annotations.Step; public class CreateAFreestyleProject implements Task { public static CreateAFreestyleProject called(String name) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java index 5ec29fc85..21e7a1c5d 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.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.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; -import net.thucydides.core.annotations.Step; public class CreateAPipelineProject implements Task { public static CreateAPipelineProject called(String name) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java index 414fc61ad..a83221502 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.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; @@ -13,7 +14,6 @@ import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; import net.serenitybdd.screenplay.targets.Target; import net.serenitybdd.screenplayx.actions.Scroll; -import net.thucydides.core.annotations.Step; class CreateAProject implements Task { public static CreateAProject called(String name) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java index 7c4e352e6..54bbc2aef 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.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.user_interface.NewJobPage; -import net.thucydides.core.annotations.Step; public class CreateAnExternalProject implements Task { public static CreateAnExternalProject called(String name) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java index feb574166..7e1d1af57 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.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.Breadcrumbs; -import net.thucydides.core.annotations.Step; public class GoBack implements Task { public static Task to(String target) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java index 63d74f518..d52b45cb9 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.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; @@ -9,7 +10,6 @@ import net.serenitybdd.screenplay.jenkins.JenkinsUser; import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage; import net.serenitybdd.screenplay.jenkins.user_interface.LogInForm; -import net.thucydides.core.annotations.Step; public class LogIn implements Task { public static LogIn as(JenkinsUser actor) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java index b28b49788..96fca77c6 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.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.JenkinsHomePage; -import net.thucydides.core.annotations.Step; public class ScheduleABuild implements Task { public static Task of(String project) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java index f3cc4bbd7..7a7bf4f33 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java @@ -2,12 +2,12 @@ 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.targets.Link; import net.serenitybdd.screenplay.jenkins.user_interface.ProjectConfigurationPage; -import net.thucydides.core.annotations.Step; public class AddABuildStep implements Task { public static Task called(String buildStepName) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java index 3ffc319d5..b3219c087 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.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.Enter; import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.GroovyPostBuildStep; -import net.thucydides.core.annotations.Step; public class AddAGroovyPostbuildScript implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java index 91cf8e948..e08078e2e 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java @@ -2,13 +2,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.targets.Link; import net.serenitybdd.screenplay.jenkins.user_interface.ProjectConfigurationPage; import net.serenitybdd.screenplayx.actions.Scroll; -import net.thucydides.core.annotations.Step; public class AddAPostBuildAction implements Task { public static Task called(String buildStepName) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/DisableExecutingConcurrentBuilds.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/DisableExecutingConcurrentBuilds.java index 772d6a054..27efdb5b4 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/DisableExecutingConcurrentBuilds.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/DisableExecutingConcurrentBuilds.java @@ -1,11 +1,11 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps; +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.ProjectConfigurationPage; import net.serenitybdd.screenplayx.actions.Scroll; -import net.thucydides.core.annotations.Step; public class DisableExecutingConcurrentBuilds implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/EnableExecutingConcurrentBuilds.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/EnableExecutingConcurrentBuilds.java index 3b634ebc2..3374b6a53 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/EnableExecutingConcurrentBuilds.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/EnableExecutingConcurrentBuilds.java @@ -1,10 +1,10 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps; +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.ProjectConfigurationPage; -import net.thucydides.core.annotations.Step; public class EnableExecutingConcurrentBuilds implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java index ffae3989a..412536d23 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.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.jenkins.actions.EnterCode; import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.ShellBuildStep; -import net.thucydides.core.annotations.Step; public class ExecuteAShellScript implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java index c00f8f36e..6119cba29 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.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.jenkins.actions.EnterCode; import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.PipelineDefinition; -import net.thucydides.core.annotations.Step; public class SetPipelineDefinition implements Task { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewJobPage.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewJobPage.java index 43adeb0be..073ed3f75 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewJobPage.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewJobPage.java @@ -1,8 +1,8 @@ package net.serenitybdd.screenplay.jenkins.user_interface; +import net.serenitybdd.annotations.DefaultUrl; import net.serenitybdd.core.pages.PageObject; import net.serenitybdd.screenplay.targets.Target; -import net.thucydides.core.annotations.DefaultUrl; @DefaultUrl("/newJob") public class NewJobPage extends PageObject { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewViewPage.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewViewPage.java index f5c32cb01..255a0ea64 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewViewPage.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/NewViewPage.java @@ -1,8 +1,8 @@ package net.serenitybdd.screenplay.jenkins.user_interface; +import net.serenitybdd.annotations.DefaultUrl; import net.serenitybdd.core.pages.PageObject; import net.serenitybdd.screenplay.targets.Target; -import net.thucydides.core.annotations.DefaultUrl; @DefaultUrl("/newView") public class NewViewPage extends PageObject { diff --git a/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java b/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java index 55a051619..983108a32 100644 --- a/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java +++ b/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java @@ -2,10 +2,10 @@ import environment.JenkinsSandbox; import java.util.List; +import net.serenitybdd.annotations.Managed; import net.serenitybdd.integration.jenkins.JenkinsInstance; import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; import net.serenitybdd.junit.runners.SerenityRunner; -import net.thucydides.core.annotations.Managed; import org.junit.Rule; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; diff --git a/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java b/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java index 02457e9a4..462f30062 100644 --- a/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java +++ b/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java @@ -7,12 +7,12 @@ import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; +import net.serenitybdd.annotations.Title; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.jenkins.HaveAProjectCreated; import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplayx.actions.Navigate; -import net.thucydides.core.annotations.Title; import org.junit.Before; import org.junit.Test;