Adapt to jenkinsci/jenkins#7927 and jenkinsci/jenkins#7942 (#794)

jenkinsci · Jul 14, 2023 · e2023a3 · e2023a3
1 parent 35fd6fa
commit e2023a3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/...e/src/main/java/com/cloudbees/hudson/plugins/folder/user_interface/FolderDetailsPage.java b/...e/src/main/java/com/cloudbees/hudson/plugins/folder/user_interface/FolderDetailsPage.java
@@ -3,5 +3,6 @@
 import net.serenitybdd.screenplay.targets.Target;
 
 public class FolderDetailsPage {
-    public static final Target Up_Link = Target.the("the 'Up' link").locatedBy("//a[contains(., 'Up')]//..");
+    public static final Target Up_Link =
+            Target.the("the 'Up' link").locatedBy("(//li[@class='jenkins-breadcrumbs__list-item'])[last()-1]/a");
 }
diff --git a/...c/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java b/...c/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java
@@ -9,7 +9,7 @@ public class Breadcrumbs {
 
     public static Target linkTo(String name) {
         return Target.the(String.format("the '%s' breadcrumb link", name))
-                .locatedBy("//ul[@id='breadcrumbs']//a[contains(., '{0}')]")
+                .locatedBy("//li[@class='jenkins-breadcrumbs__list-item' and a[text()='{0}']]/a")
                 .of(name);
     }
 }
diff --git a/...e/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java b/...e/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java
@@ -4,8 +4,7 @@
 import net.serenitybdd.screenplay.targets.Target;
 
 public class Buttons {
-    public static final Target Create =
-            Target.the("the 'Create' button").locatedBy("//input[@name='Submit' and @value='Create']");
+    public static final Target Create = Target.the("the 'Create' button").locatedBy("//button[@name='Submit']");
     public static final Target Save = Button.called("Save");
     public static final Target OK = Button.called("OK");
 }
diff --git a/build-monitor-plugin/pom.xml b/build-monitor-plugin/pom.xml
@@ -49,8 +49,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
-        <version>2102.v854b_fec19c92</version>
+        <artifactId>bom-2.401.x</artifactId>
+        <version>2230.v0cb_4040cde55</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit-realtime-test-reporter</artifactId>
-      <version>90.v7dc2c937f9a_8</version>
+      <version>102.v3f020960a_646</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>view-job-filters</artifactId>
-      <version>2.3</version>
+      <version>364.v48a_33389553d</version>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/.../com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/configure-entries.jelly b/.../com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/configure-entries.jelly
@@ -27,7 +27,7 @@
           <j:set var="spanStyle" value="${it.recurse?'':'display:none'}"/>
         </j:if>
         <span class="${spanClass}" style="${spanStyle}">
-          <f:checkbox name="${job.getRelativeNameFromGroup(it.ownerItemGroup)}" checked="${it.jobNamesContains(job)}" title="${h.getRelativeDisplayNameFrom(job,it.ownerItemGroup)}" tooltip="${job.fullName}" json="true"/>
+          <f:checkbox name="item_${job.getRelativeNameFromGroup(it.ownerItemGroup)}" checked="${it.jobNamesContains(job)}" title="${h.getRelativeDisplayNameFrom(job,it.ownerItemGroup)}" tooltip="${job.fullName}" json="true"/>
           <br/>
         </span>
       </j:forEach>

diff --git a/...in/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/index.jelly b/...in/resources/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView/index.jelly
@@ -30,8 +30,7 @@
             <l:yui module="yahoo" />
             <l:yui module="cookie" />
 
-            <st:adjunct assumes="org.kohsuke.stapler.framework.prototype.prototype"
-                        includes="org.kohsuke.stapler.bind"/>
+            <st:adjunct includes="org.kohsuke.stapler.bind"/>
 
             <j:forEach var="pd" items="${h.pageDecorators}">
                 <st:include it="${pd}" page="header.jelly" optional="true" />

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
   <properties>
     <revision>1.14</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.361.4</jenkins.version>
+    <jenkins.version>2.406</jenkins.version>
     <gitHubRepo>jenkinsci/build-monitor-plugin</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>