Adapt to new build symbols (requires 2.434) (#183)

jenkinsci · May 23, 2024 · 7eada56 · 7eada56
1 parent a01b67e
commit 7eada56
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <properties>
       <changelist>999999-SNAPSHOT</changelist>
       <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-      <jenkins.version>2.401.3</jenkins.version>
+      <jenkins.version>2.440.3</jenkins.version>
       <spotbugs.skip>true</spotbugs.skip> <!-- Clean up redundant null check warnings and re-enable after SECURITY-1339 is released -->
     </properties>
     <licenses>
@@ -79,8 +79,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.401.x</artifactId>
-                <version>2745.vc7b_fe4c876fa_</version>
+                <artifactId>bom-2.440.x</artifactId>
+                <version>3056.v53343b_a_b_a_850</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly
@@ -32,11 +32,12 @@ THE SOFTWARE.
       <j:set var="b" value="${p.run}" />
       <j:choose>
         <j:when test="${b==null}">
-          <l:icon class="icon-nobuilt icon-md" tooltip="${%Not run}" alt="${%Not run}"/>
+          <l:icon src="symbol-status-nobuilt" class="icon-md" tooltip="${%Not run}" alt="${%Not run}"/>
+          ${%Not run}
         </j:when>
         <j:otherwise>
+          <l:icon src="symbol-status-${b.iconColor.iconName}" class="icon-md" tooltip="${h.xmlEscape(p.tooltip)} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="vertical-align: middle; ${it.number!=b.number?'opacity:0.5':''}"/>
           <a href="${p.nearestRunUrl}" class="model-link inside">
-            <l:icon class="${b.iconColor.iconClassName} icon-md" tooltip="${h.xmlEscape(p.tooltip)} ${it.number!=b.number?(it.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="${it.number!=b.number?'opacity:0.5':''}"/>
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
             </j:if>

diff --git a/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly b/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly
@@ -31,11 +31,12 @@ THE SOFTWARE.
     <p:matrix autoRefresh="true">
       <j:choose>
         <j:when test="${p==null}">
-          <l:icon class="icon-nobuilt icon-md" tooltip="${%Not configured}" alt="${%Not configured}"/>
+          <l:icon src="symbol-status-nobuilt" class="icon-md" tooltip="${%Not configured}" alt="${%Not configured}"/>
+          ${%Not configured}
         </j:when>
         <j:otherwise>
-          <a href="${p.shortUrl}" class="model-link inside">
-            <l:icon class="${p.iconColor.iconClassName} icon-md" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
+          <l:icon src="symbol-status-${p.iconColor.iconName}" class="icon-md" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
+          <a href="${p.shortUrl}" class="model-link inside" style="vertical-align: middle">
             <j:if test="${empty(o.x) and empty(o.y)}">
               ${p.combination.toString(o.z)}
             </j:if>