Merge branch 'master' into fix-23885-sidebar-navigation

Author: daniel-beck

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6507.vef7dc6b_6f5c4
+export ATH_VERSION=6512.v7b_8c43086a_6f
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21

bom/pom.xml

@@ -250,12 +250,12 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>symbol-annotation</artifactId>
-        <version>1.25</version>
+        <version>1.26</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>
         <artifactId>task-reactor</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci</groupId>

core/pom.xml

@@ -419,7 +419,7 @@ THE SOFTWARE.
       <!-- working around MCOMPILER-97 -->
       <groupId>org.jenkins-ci</groupId>
       <artifactId>core-annotation-processors</artifactId>
-      <version>13.v2dcfc22a_a_b_29</version>
+      <version>59.ve181f58722c6</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

core/src/main/resources/lib/layout/job-subpage.jelly

@@ -103,7 +103,7 @@ THE SOFTWARE.
                 </j:when>
               </j:choose>
 
-              <l:overflowButton>
+              <l:overflowButton id="more-item-actions">
                 <dd:custom>
                   <div class="app-build-overflow">
                     <j:set var="mode" value="side-panel" />

core/src/main/resources/lib/layout/overflowButton.jelly

@@ -44,13 +44,17 @@ THE SOFTWARE.
     <st:attribute name="id">
       Optional ID for the button
     </st:attribute>
+    <st:attribute name="testid">
+      Optional test id for the button. Will be rendered as `data-testid`. Defaults to id if provided or empty.
+    </st:attribute>
 
     Displays a button which when clicked displays a dropdown of the component's children
   </st:documentation>
 
   <button class="jenkins-button ${attrs.clazz}"
           tooltip="${attrs.containsKey('tooltip') ? attrs.tooltip : '%More actions'}"
           id="${attrs.id}"
+          data-testid="${attrs.containsKey('testId') ? attrs.testid  : attrs.containsKey('id') ? attrs.id : ''}"
           type="button" data-dropdown="true">
     <j:choose>
       <j:when test="${attrs.containsKey('icon')}">

package.json

@@ -34,7 +34,7 @@
     "eslint": "9.39.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-formatter-checkstyle": "9.0.1",
-    "globals": "16.5.0",
+    "globals": "17.0.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.4",
     "postcss": "8.5.6",

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>2.1326.v00b_e26755312</version>
+    <version>2.1328.vfd10e2339a_19</version>
     <relativePath />
   </parent>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.545</revision>
+    <revision>2.546</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2025-12-30T06:44:02Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2026-01-06T06:42:50Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>

src/main/js/add-item.js

@@ -135,8 +135,8 @@ document.addEventListener("DOMContentLoaded", () => {
         $items.append(drawItem(elem));
       });
 
-      $catHeader.append(title);
-      $catHeader.append(description);
+      $catHeader.append(createElementFromHtml(title));
+      $catHeader.append(createElementFromHtml(description));
       $category.append($catHeader);
       $category.append($items);
 

test/pom.xml

@@ -192,7 +192,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2541.v6e1dd03c77b_b_</version>
+      <version>2544.v272f2b_d841b_2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

test/src/test/java/jenkins/security/stapler/Security914Test.java

@@ -55,12 +55,12 @@ void setUp(JenkinsRule rule) {
     void cannotUseInvalidLocale_toTraverseFolder() throws Exception {
         assumeTrue(Functions.isWindows());
 
-        assertNotNull(j.getPluginManager().getPlugin("credentials"));
-        j.createWebClient().goTo("plugin/credentials/images/credentials.svg", "image/svg+xml");
+        assertNotNull(j.getPluginManager().getPlugin("matrix-project"));
+        j.createWebClient().goTo("plugin/matrix-project/images/matrixproject.svg", "image/svg+xml");
 
         JenkinsRule.WebClient wc = j.createWebClient()
                 .withThrowExceptionOnFailingStatusCode(false);
-        WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/credentials/.xml").toURL());
+        WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/matrix-project/.xml").toURL());
         // plugin deployed in: test\target\jenkins7375296945862059919tmp
         // rootDir is in     : test\target\jenkinsTests.tmp\jenkins1274934531848159942test
         // j.jenkins.getRootDir().getName() = jenkins1274934531848159942test
@@ -75,12 +75,12 @@ void cannotUseInvalidLocale_toTraverseFolder() throws Exception {
     void cannotUseInvalidLocale_toAnyFileInSystem() throws Exception {
         assumeTrue(Functions.isWindows());
 
-        assertNotNull(j.getPluginManager().getPlugin("credentials"));
-        j.createWebClient().goTo("plugin/credentials/images/credentials.svg", "image/svg+xml");
+        assertNotNull(j.getPluginManager().getPlugin("matrix-project"));
+        j.createWebClient().goTo("plugin/matrix-project/images/matrixproject.svg", "image/svg+xml");
 
         JenkinsRule.WebClient wc = j.createWebClient()
                 .withThrowExceptionOnFailingStatusCode(false);
-        WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/credentials/.ini").toURL());
+        WebRequest request = new WebRequest(new URI(j.getURL() + "plugin/matrix-project/.ini").toURL());
         // ../ can be multiply to infinity, no impact, we just need to have enough to reach the root
         request.setAdditionalHeader("Accept-Language", "../../../../../../../../../../../../windows/win");