Merge branch 'master' into yui_button_inspired_style

jenkinsci · Jan 2, 2025 · 5f83efb · 5f83efb
2 parents 80665d4 + 0a64505
commit 5f83efb
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 219 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -10,6 +10,7 @@
   "postUpdateOptions": [
     "yarnDedupeHighest"
   ],
+  "ignoreDeps": ["softprops/action-gh-release"],
   "packageRules": [
     {
       "matchDatasources": [

diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml
@@ -73,7 +73,7 @@ jobs:
           wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
       - name: Upload Release Asset
         id: upload-war
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -108,7 +108,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-deb
         if: always()
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -144,7 +144,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-rpm
         if: always()
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -180,7 +180,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-msi
         if: always()
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -216,7 +216,7 @@ jobs:
       - name: Upload Release Asset
         id: upload-suse-rpm
         if: always()
-        uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # v2.2.0
+        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml
@@ -29,7 +29,7 @@ jobs:
         id: run_script
         shell: bash
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Fill in since annotations

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -169,7 +169,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.15.0</version>
+        <version>5.16.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.sezpoz</groupId>

diff --git a/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties b/core/src/main/resources/hudson/util/HudsonIsLoading/index.properties
@@ -1,4 +1,4 @@
 Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
  Jenkins is getting ready to work
 Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
- Your browser will reload automatically when Jenkins is ready
+ Your browser will reload automatically when Jenkins is ready.
diff --git a/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties b/core/src/main/resources/hudson/util/HudsonIsRestarting/index.properties
@@ -1,2 +1,3 @@
 Please\ wait\ while\ Jenkins\ is\ restarting=\
  Jenkins is restarting
+Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Your browser will reload automatically when Jenkins is ready.
diff --git a/core/src/main/resources/lib/hudson/buildHealth.jelly b/core/src/main/resources/lib/hudson/buildHealth.jelly
@@ -22,15 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-  <%@ attribute name="job" use="required" type="hudson.model.Job" %>
-  <%@ attribute name="iconSizeClass" type="java.lang.String" %>
-  <%@ attribute name="iconSize" type="java.lang.String" %>
-  <%@ attribute name="td" required="false" type="java.lang.String" %>
-  <%@ attribute name="link" required="false" type="java.lang.String" %>
--->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:documentation>
+    <st:attribute name="job" use="required" type="hudson.model.Job">Job to display the health report.</st:attribute>
+    <st:attribute name="td" type="java.lang.Boolean">If `td` should be used instead of `div` to wrap the health reports.</st:attribute>
+    <st:attribute name="link" type="java.lang.String">href of the link.</st:attribute>
+    <st:attribute name="style" type="java.lang.String">link style.</st:attribute>
+  </st:documentation>
   <j:set var="healthReports" value="${job.buildHealthReports}"/>
   <j:new var="emptyHealthReport" className="hudson.model.HealthReport"/>
   <j:set var="buildHealth" value="${empty(healthReports) ? emptyHealthReport : healthReports[0]}"/>

diff --git a/core/src/main/resources/lib/hudson/buildRangeLink.jelly b/core/src/main/resources/lib/hudson/buildRangeLink.jelly
@@ -22,15 +22,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-  Link to a range of build. Used by fingerprint/index.jsp
-
-	<%@ attribute name="range" type="java.lang.Object" use="required" %>
-	<%@ attribute name="job" type="hudson.model.Job" use="required" %>
--->
 <!-- it's hudson.model.Fingerprint.RangeSet but Tomcat can't seem to handler inner classes -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+	<st:documentation>
+		Link to a range of build. Used by fingerprint/index.jelly
+		<st:attribute name="range" type="hudson.model.Fingerprint.RangeSet" use="required">A range set of builds</st:attribute>
+		<st:attribute name="job" type="hudson.model.Job" use="required">The owner of the builds</st:attribute>
+	</st:documentation>
 	<j:forEach var="r" items="${range.ranges}">
 	  <j:choose>
 	    <j:when test="${r.start==r.end-1}">

diff --git a/core/src/main/resources/lib/hudson/progressiveText.jelly b/core/src/main/resources/lib/hudson/progressiveText.jelly
@@ -22,19 +22,18 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 
-<!--
-  Use AJAX to load text data progressively.
-  This is used to achieve the effect of "tail -f"
-  without relying on full page reload.
-
-	<%@attribute name="href" use="required" description="URL that returns text data" %>
-	<%@attribute name="idref" use="required" description="ID of the HTML element in which the result is displayed" %>
-	<%@attribute name="spinner" required="false" description="ID of the HTML element in which the spinner is displayed" %>
-	<%@attribute name="startOffset" required="false" description="Skip this many bytes rather than showing from start of data" %>
-	<%@attribute name="onFinishEvent" required="false" description="JS custom event to be fired when progress is finished" %>
--->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <st:documentation>
+    Use AJAX to load text data progressively.
+    This is used to achieve the effect of "tail -f"
+    without relying on full page reload.
+    <st:attribute name="href" use="required">URL that returns text data</st:attribute>
+    <st:attribute name="idref" use="required">ID of the HTML element in which the result is displayed</st:attribute>
+    <st:attribute name="spinner">ID of the HTML element in which the spinner is displayed</st:attribute>
+    <st:attribute name="startOffset">Skip this many bytes rather than showing from start of data</st:attribute>
+    <st:attribute name="onFinishEvent">JS custom event to be fired when progress is finished</st:attribute>
+  </st:documentation>
   <div class="progressiveText-holder" data-href="${href}" data-idref="${idref}" data-spinner="${spinner}" data-start-offset="${startOffset}"
        data-on-finish-event="${empty(onFinishEvent) ? '' : onFinishEvent}"
        data-error-message="${%errorMessage}"/>

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "build": "yarn prod",
     "start": "yarn dev --watch",
     "lint:js": "eslint . && prettier --check .",
-    "lint:js-ci": "eslint . -f checkstyle -o target/eslint-warnings.xml && prettier --check .",
+    "lint:js-ci": "eslint . -f checkstyle -o target/eslint-warnings.xml",
     "lint:css": "stylelint src/main/scss",
     "lint:css-ci": "stylelint src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml",
     "lint:ci": "yarn lint:js-ci && yarn lint:css-ci",
@@ -34,12 +34,12 @@
     "eslint": "9.17.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.13.0",
+    "globals": "15.14.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.2",
     "postcss": "8.4.49",
     "postcss-loader": "8.1.1",
-    "postcss-preset-env": "10.1.2",
+    "postcss-preset-env": "10.1.3",
     "postcss-scss": "4.0.9",
     "prettier": "3.4.2",
     "sass": "1.83.0",
@@ -49,7 +49,7 @@
     "stylelint-checkstyle-reporter": "1.0.0",
     "stylelint-config-standard": "36.0.1",
     "webpack": "5.97.1",
-    "webpack-cli": "5.1.4",
+    "webpack-cli": "6.0.1",
     "webpack-remove-empty-scripts": "1.0.4"
   },
   "dependencies": {

diff --git a/pom.xml b/pom.xml
@@ -281,7 +281,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.21.0</version>
+              <version>10.21.1</version>
             </dependency>
           </dependencies>
           <executions>
@@ -519,6 +519,18 @@ THE SOFTWARE.
                   <skip>${yarn.lint.skip}</skip>
                 </configuration>
               </execution>
+              <execution>
+                <id>prettier</id>
+                <goals>
+                  <goal>corepack</goal>
+                </goals>
+                <phase>test</phase>
+                <configuration>
+                  <arguments>yarn exec prettier --check .</arguments>
+                  <skip>${yarn.lint.skip}</skip>
+                  <testFailureIgnore>false</testFailureIgnore>
+                </configuration>
+              </execution>
             </executions>
           </plugin>
         </plugins>

diff --git a/src/main/js/components/command-palette/index.js b/src/main/js/components/command-palette/index.js
@@ -13,6 +13,9 @@ function init() {
   const headerCommandPaletteButton = document.getElementById(
     "button-open-command-palette",
   );
+  if (headerCommandPaletteButton === null) {
+    return; // no JenkinsHeader, no h:searchbox
+  }
   const commandPalette = document.getElementById("command-palette");
   const commandPaletteWrapper = commandPalette.querySelector(
     ".jenkins-command-palette__wrapper",

diff --git a/test/pom.xml b/test/pom.xml
@@ -100,7 +100,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>bouncycastle-api</artifactId>
-        <version>2.30.1.78.1-248.ve27176eb_46cb_</version>
+        <version>2.30.1.79-254.vfdb_814e7791e</version>
       </dependency>
       <dependency>
         <!-- RequireUpperBoundDeps via mailer and junit -->
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2364.v163897b_238b_3</version>
+      <version>2370.vfb_b_0c547a_659</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -224,13 +224,13 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1393.v6017143c1763</version>
+      <version>1405.vb_cda_74a_f8974</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1311.v39e1716e4eb_e</version>
+      <version>1312.v1a_235a_b_94a_31</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -344,7 +344,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>332.vdc252e2da_5e4</version>
+                  <version>336.v9effb_429a_d34</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

diff --git a/test/src/test/java/lib/layout/LayoutTest.java b/test/src/test/java/lib/layout/LayoutTest.java
@@ -53,4 +53,9 @@ public class LayoutTest {
         }
     }
 
+    @Test public void fullScreen() throws Exception {
+        // Example page using <l:layout type="full-screen">:
+        r.createWebClient().goTo("setupWizard/proxy-configuration");
+    }
+
 }
diff --git a/war/pom.xml b/war/pom.xml
@@ -46,7 +46,7 @@ THE SOFTWARE.
     <host>localhost</host>
     <!-- HTTP listener port -->
     <port>8080</port>
-    <mina-sshd-api.version>2.14.0-136.v4d2b_0853615e</mina-sshd-api.version>
+    <mina-sshd-api.version>2.14.0-138.v6341ee58e1df</mina-sshd-api.version>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
     <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
 
@@ -314,7 +314,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1311.v39e1716e4eb_e</version>
+                  <version>1312.v1a_235a_b_94a_31</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -365,7 +365,7 @@ THE SOFTWARE.
                   <!-- dependency of junit -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>echarts-api</artifactId>
-                  <version>5.5.1-4</version>
+                  <version>5.5.1-5</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -432,7 +432,7 @@ THE SOFTWARE.
                   <!-- detached after 2.16 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>bouncycastle-api</artifactId>
-                  <version>2.30.1.78.1-248.ve27176eb_46cb_</version>
+                  <version>2.30.1.79-254.vfdb_814e7791e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js
@@ -536,21 +536,24 @@ function findNext(src, filter) {
 }
 
 function findFormItem(src, name, directionF) {
-  var name2 = "_." + name; // handles <textbox field="..." /> notation silently
+  const name2 = "_." + name; // handles <textbox field="..." /> notation silently
   return directionF(src, function (e) {
-    if (e.tagName == "INPUT" && e.type == "radio" && e.checked == true) {
-      var r = 0;
-      while (e.name.substring(r, r + 8) == "removeme") {
-        //radio buttons have must be unique in repeatable blocks so name is prefixed
-        r = e.name.indexOf("_", r + 8) + 1;
+    if (e.tagName === "INPUT" && e.type === "radio") {
+      if (e.checked === true) {
+        let r = 0;
+        while (e.name.substring(r, r + 8) === "removeme") {
+          //radio buttons have must be unique in repeatable blocks so name is prefixed
+          r = e.name.indexOf("_", r + 8) + 1;
+        }
+        return name === e.name.substring(r);
       }
-      return name == e.name.substring(r);
+      return false;
     }
     return (
-      (e.tagName == "INPUT" ||
-        e.tagName == "TEXTAREA" ||
-        e.tagName == "SELECT") &&
-      (e.name == name || e.name == name2)
+      (e.tagName === "INPUT" ||
+        e.tagName === "TEXTAREA" ||
+        e.tagName === "SELECT") &&
+      (e.name === name || e.name === name2)
     );
   });
 }
@@ -730,7 +733,16 @@ function registerValidator(e) {
           console.warn("Unable to find nearby " + name);
           return;
         }
-        c.addEventListener("change", checker.bind(e));
+
+        if (c.tagName === "INPUT" && c.type === "radio") {
+          document
+            .querySelectorAll(`input[name='${c.name}'][type='radio']`)
+            .forEach((element) => {
+              element.addEventListener("change", checker.bind(e));
+            });
+        } else {
+          c.addEventListener("change", checker.bind(e));
+        }
       }),
     );
   }