Merge pull request #3 from jenkinsci/master

merging to local branch

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=5853.v19710fb_b_5d8a_
+export ATH_VERSION=5858.v4b_c4e3b_16099
 
 if [[ $# -eq 0 ]]; then
 	export JDK=17

bom/pom.xml

@@ -56,7 +56,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.35</version>
+        <version>5.3.36</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

core/src/main/resources/hudson/model/Run/console.jelly

@@ -28,15 +28,28 @@ THE SOFTWARE.
   Displays the console output
 -->
 <?jelly escape-by-default='true'?>
-<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson">
   <l:layout title="${it.fullDisplayName} Console">
     <st:include page="sidepanel.jelly" />
-     <l:breadcrumb title="${%Console Output}" />
+
+    <l:breadcrumb title="${%Console Output}" />
+
     <l:main-panel>
-      <t:buildCaption>
+      <j:set var="controls">
+        <a class="jenkins-button" href="consoleText" download="${it.displayName}.txt">
+          <l:icon src="symbol-download" />
+          ${%Download}
+        </a>
+        <l:copyButton ref="out" label="${%Copy}" />
+        <a class="jenkins-button" href="consoleText">
+          ${%View as plain text}
+        </a>
+      </j:set>
+
+      <t:buildCaption controls="${controls}">
         ${%Console Output}
-        <l:copyButton message="${%successfullyCopied}" tooltip="${%clickToCopy}" ref="out"/>
       </t:buildCaption>
+
       <j:set var="threshold" value="${h.getSystemProperty('hudson.consoleTailKB')?:'150'}" />
       <!-- Show at most last 150KB (can override with system property) unless consoleFull is set -->
       <j:set var="offset" value="${empty(consoleFull) ? it.logText.length()-threshold*1024 : 0}" />

core/src/main/resources/hudson/model/Run/console.properties

@@ -21,5 +21,3 @@
 # THE SOFTWARE.
 
 skipSome=Skipping {0,number,integer} KB.. <a href="{1}">Full Log</a>
-clickToCopy=Click to copy
-successfullyCopied=Copied to clipboard

core/src/main/resources/lib/hudson/buildCaption.jelly

@@ -27,6 +27,12 @@ THE SOFTWARE.
 -->
 <?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>
+    <st:attribute name="controls">
+      Optional field to set controls in the app bar
+    </st:attribute>
+  </st:documentation>
+
   <div class="jenkins-app-bar">
     <div class="jenkins-app-bar__content jenkins-build-caption" data-status-url="${rootURL}/${it.url}statusIcon">
       <l:icon alt="${it.iconColor.description}" src="symbol-status-${it.iconColor.iconName}"
@@ -47,6 +53,7 @@ THE SOFTWARE.
         </div>
       </j:if>
       <st:adjunct includes="lib.hudson.build-caption"/>
+      <j:out value="${attrs.controls}" />
     </div>
   </div>
 </j:jelly>

core/src/main/resources/lib/hudson/project/console-link.jelly

@@ -25,16 +25,5 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <!-- Displays a console link for a build. -->
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <j:choose>
-        <j:when test="${it.logFile.length() > 200000}">
-            <!-- Show raw link directly so user need not click through live console page, though this is not so bad now as they would just see: Skipping nnn KB.. Full Log. -->
-            <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md" title="${%Console Output}"/>
-            <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-        </j:when>
-        <j:otherwise>
-            <l:task icon="images/svgs/terminal.svg" href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" title="${%Console Output}">
-                <l:task href="${buildUrl.baseUrl}/consoleText" icon="icon-document icon-md" title="${%View as plain text}"/>
-            </l:task>
-        </j:otherwise>
-    </j:choose>
+    <l:task href="${h.getConsoleUrl(it) ?: (buildUrl.baseUrl + '/console')}" icon="icon-terminal icon-md"  title="${%Console Output}" />
 </j:jelly>

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

@@ -43,6 +43,9 @@ THE SOFTWARE.
     <st:attribute name="clazz">
       Additional CSS class names
     </st:attribute>
+    <st:attribute name="label">
+      Optional label for the button, hides the tooltip if set
+    </st:attribute>
     <st:attribute name="ref" use="required">
       The id of the target element to be copied
       @since 2.449
@@ -54,9 +57,10 @@ THE SOFTWARE.
           text="${attrs.text}"
           ref="${attrs.ref}"
           message="${attrs.message ?: '%Copied'}"
-          tooltip="${attrs.tooltip ?: '%Copy'}"
+          tooltip="${attrs.label != null ? null : attrs.tooltip ?: '%Copy'}"
           type="button">
     <span class="jenkins-copy-button__icon" />
+    ${attrs.label}
   </button>
 
   <st:adjunct includes="lib.layout.copyButton.copyButton"/>

test/pom.xml

@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2202.va_a_4166b_05253</version>
+      <version>2205.v7e19cc98f9c7</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -241,7 +241,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>822.824.v14451b_c0fd42</version>
+      <version>830.v7ea_da_561b_a_34</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -329,7 +329,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>design-library</artifactId>
-                  <version>303.v6b_23c12334c9</version>
+                  <version>304.v44f7d19e8537</version>
                   <type>hpi</type>
                   <outputDirectory>${project.build.outputDirectory}/plugins</outputDirectory>
                   <destFileName>design-library.jpi</destFileName>

war/package.json

@@ -34,7 +34,7 @@
     "eslint": "9.3.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-formatter-checkstyle": "8.40.0",
-    "globals": "15.2.0",
+    "globals": "15.3.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.9.0",
     "postcss": "8.4.38",

war/pom.xml

@@ -239,7 +239,7 @@ THE SOFTWARE.
                   <!-- detached after 1.561 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>matrix-project</artifactId>
-                  <version>822.824.v14451b_c0fd42</version>
+                  <version>830.v7ea_da_561b_a_34</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>

war/yarn.lock

@@ -3957,10 +3957,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:15.2.0":
-  version: 15.2.0
-  resolution: "globals@npm:15.2.0"
-  checksum: 10c0/ba8c34ef10fc1e65319bfde912a76dbe7654085af8b09d897974cfbe000c6d950ddcf28b4a0de372fe4144836aede32210a97b27ef184f68e1ff8bcd1a74fc5e
+"globals@npm:15.3.0":
+  version: 15.3.0
+  resolution: "globals@npm:15.3.0"
+  checksum: 10c0/edbef1c528185d02636ed6d72a1688168b922d6176031904386214f8b59d893f1d0a28da519b95665f557d366b17ea1affb9f433ea451e7372e2808fb31079d7
   languageName: node
   linkType: hard
 
@@ -4380,7 +4380,7 @@ __metadata:
     eslint: "npm:9.3.0"
     eslint-config-prettier: "npm:9.1.0"
     eslint-formatter-checkstyle: "npm:8.40.0"
-    globals: "npm:15.2.0"
+    globals: "npm:15.3.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"
     hotkeys-js: "npm:3.12.2"