Merge branch 'master' into DND-2210

smartrecruiters · Oct 1, 2024 · 240fa5f · 240fa5f
2 parents 833c55e + 60079eb
commit 240fa5f
Show file tree

Hide file tree

Showing 11 changed files with 201 additions and 230 deletions.
diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml
@@ -12,34 +12,37 @@
   <name>Build Monitor Acceptance Tests</name>
 
   <properties>
-    <byte-buddy.version>1.15.0</byte-buddy.version>
-    <serenity.version>4.2.0</serenity.version>
-    <slf4j.version>2.0.16</slf4j.version>
+    <byte-buddy.version>1.15.3</byte-buddy.version>
+    <serenity.version>4.2.3</serenity.version>
+    <!-- TODO until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>10.0.23</version>
+        <version>10.0.24</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.11.0</version>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-bom</artifactId>
+        <version>2.0.16</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.errorprone</groupId>
         <artifactId>error_prone_annotations</artifactId>
-        <version>2.30.0</version>
+        <version>2.32.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.3.0-jre</version>
+        <version>33.3.1-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.inject</groupId>
@@ -59,7 +62,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.16.1</version>
+        <version>2.17.0</version>
       </dependency>
       <dependency>
         <groupId>net.bytebuddy</groupId>
@@ -76,36 +79,16 @@
         <artifactId>commons-compress</artifactId>
         <version>1.27.1</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.16.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-text</artifactId>
-        <version>1.12.0</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>4.5.14</version>
       </dependency>
-      <dependency>
-        <groupId>org.objenesis</groupId>
-        <artifactId>objenesis</artifactId>
-        <version>3.4</version>
-      </dependency>
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
         <version>1.18.34</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -157,7 +140,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>net.serenity-bdd</groupId>
@@ -187,29 +169,6 @@
           <skipTests>true</skipTests>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>display-info</id>
-            <configuration>
-              <rules>
-                <enforceBytecodeVersion>
-                  <excludes combine.children="append">
-                    <exclude>org.freemarker:freemarker</exclude>
-                  </excludes>
-                </enforceBytecodeVersion>
-                <requireUpperBoundDeps>
-                  <excludes combine.children="append">
-                    <exclude>org.htmlunit:htmlunit</exclude>
-                  </excludes>
-                </requireUpperBoundDeps>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>

diff --git a/...main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java b/...main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java
@@ -23,9 +23,8 @@ public <T extends Actor> void performAs(T actor) {
         actor.attemptsTo(
                 Scroll.to(FailureCauseManagementPage.Add_Indication),
                 Click.on(FailureCauseManagementPage.Add_Indication),
-                WaitUntil.the(
-                        FailureCauseManagementPage.Build_Log_Indication_Link, WebElementStateMatchers.isVisible()),
-                Click.on(FailureCauseManagementPage.Build_Log_Indication_Link),
+                WaitUntil.the(FailureCauseManagementPage.Build_Log_Indication, WebElementStateMatchers.isVisible()),
+                Click.on(FailureCauseManagementPage.Build_Log_Indication),
                 Enter.theValue(pattern).into(FailureCauseManagementPage.Pattern_Field));
     }
 

diff --git a/.../java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java b/.../java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java
@@ -12,7 +12,7 @@ public class FailureCauseManagementPage {
             Target.the("the description textarea").locatedBy("//textarea[@name='_.description']");
     public static final Target Add_Indication = Button.called("Add Indication");
 
-    public static final Target Build_Log_Indication_Link = Link.called("Build Log Indication");
+    public static final Target Build_Log_Indication = Button.called("Build Log Indication");
     public static final Target Pattern_Field = Input.named("pattern");
 
     public static final Target Save = Button.called("Save");

diff --git a/...ava/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java b/...ava/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddABuildStep.java
@@ -6,7 +6,7 @@
 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.targets.Button;
 import net.serenitybdd.screenplay.jenkins.user_interface.ProjectConfigurationPage;
 
 public class AddABuildStep implements Task {
@@ -22,7 +22,7 @@ public <T extends Actor> void performAs(final T actor) {
                 Click.on(ProjectConfigurationPage.Build_Steps),
                 Sleep.of(1, TimeUnit.SECONDS),
                 Click.on(ProjectConfigurationPage.Add_Build_Step),
-                Click.on(Link.called(buildStepName)));
+                Click.on(Button.called(buildStepName)));
     }
 
     public AddABuildStep(String buildStepName) {

diff --git a/...t/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java b/...t/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAPostBuildAction.java
@@ -6,7 +6,7 @@
 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.targets.Button;
 import net.serenitybdd.screenplay.jenkins.user_interface.ProjectConfigurationPage;
 import net.serenitybdd.screenplayx.actions.Scroll;
 
@@ -24,7 +24,7 @@ public <T extends Actor> void performAs(T actor) {
                 Sleep.of(1, TimeUnit.SECONDS),
                 Click.on(ProjectConfigurationPage.Add_Post_Build_Action),
                 Sleep.of(1, TimeUnit.SECONDS),
-                Click.on(Link.called(postBuildActionName)));
+                Click.on(Button.called(postBuildActionName)));
     }
 
     public AddAPostBuildAction(String postBuildActionName) {