Merge branch 'master' into tippy-1-tooltip

janfaracik · Mar 22, 2022 · 93632d3 · 93632d3
2 parents 60e4232 + 5144035
commit 93632d3
Show file tree

Hide file tree

Showing 93 changed files with 680 additions and 316 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -20,7 +20,7 @@ properties([
 ])
 
 def buildTypes = ['Linux', 'Windows']
-def jdks = [8, 11]
+def jdks = [8, 11, 17]
 
 def builds = [:]
 for (i = 0; i < buildTypes.size(); i++) {
@@ -30,6 +30,9 @@ for (i = 0; i < buildTypes.size(); i++) {
     if (buildType == 'Windows' && jdk == 8) {
       continue // unnecessary use of hardware
     }
+    if (buildType == 'Windows' && jdk == 17) {
+      continue // TODO pending jenkins-infra/helpdesk#2822
+    }
     builds["${buildType}-jdk${jdk}"] = {
       // see https://github.com/jenkins-infra/documentation/blob/master/ci.adoc#node-labels for information on what node types are available
       def agentContainerLabel = jdk == 8 ? 'maven' : 'maven-' + jdk

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.2</asm.version>
     <slf4jVersion>1.7.36</slf4jVersion>
-    <stapler.version>1666.v0275e61a_9874</stapler.version>
+    <stapler.version>1669.v95a_4b_919a_b_a_2</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -818,5 +818,21 @@ THE SOFTWARE.
         <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
       </properties>
     </profile>
+    <profile>
+      <id>jdk-9-and-above</id>
+      <activation>
+        <jdk>[9,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
@@ -1266,7 +1266,12 @@ public int compareTo(Tag that) {
 
     public static String getIconFilePath(Action a) {
         String name = a.getIconFileName();
-        if (name == null)     return null;
+        if (name == null) {
+            return null;
+        }
+        if (name.startsWith("symbol-")) {
+            return name;
+        }
         if (name.startsWith("/"))
             return name.substring(1);
         else

diff --git a/core/src/main/java/hudson/model/Fingerprint.java b/core/src/main/java/hudson/model/Fingerprint.java
@@ -1414,10 +1414,6 @@ private static void initFacets(@CheckForNull Fingerprint fingerprint) {
         if (fingerprint == null) {
             return;
         }
-        if (fingerprint.facets == null) {
-            logger.log(Level.WARNING, "Missing fingerprint facet, see JENKINS-67602");
-            return;
-        }
 
         for (FingerprintFacet facet : fingerprint.facets) {
             facet._setOwner(fingerprint);

diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
@@ -282,6 +282,16 @@ void setTemporaryOfflineCause(OfflineCause cause) {
         }
     }
 
+    /**
+     * Get the cause if temporary offline.
+     *
+     * @return null if not temporary offline or there was no cause given.
+     * @since TODO
+     */
+    public OfflineCause getTemporaryOfflineCause() {
+        return temporaryOfflineCause;
+    }
+
     /**
      * Return the possibly empty tag cloud for the labels of this node.
      */

diff --git a/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java b/core/src/main/java/jenkins/fingerprints/FileFingerprintStorage.java
@@ -90,6 +90,9 @@ public FileFingerprintStorage() {}
     /**
      * Load the Fingerprint stored inside the given file.
      */
+    @SuppressFBWarnings(
+            value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE",
+            justification = "intentional check for fingerprint corruption")
     public static @CheckForNull Fingerprint load(@NonNull File file) throws IOException {
         XmlFile configFile = getConfigFile(file);
         if (!configFile.exists()) {
@@ -103,6 +106,11 @@ public FileFingerprintStorage() {}
                         + (loaded != null ? loaded.getClass() : "null"));
             }
             Fingerprint f = (Fingerprint) loaded;
+            if (f.getPersistedFacets() == null) {
+                logger.log(Level.WARNING, "Malformed fingerprint {0}: Missing facets", configFile);
+                Files.deleteIfExists(Util.fileToPath(file));
+                return null;
+            }
             return f;
         } catch (IOException e) {
             if (Files.exists(Util.fileToPath(file)) && Files.size(Util.fileToPath(file)) == 0) {

diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -99,11 +99,15 @@ public ContextMenu add(Action a) {
             String text = a.getDisplayName();
             String base = Functions.getIconFilePath(a);
             if (base == null)     return this;
-            String icon = Stapler.getCurrentRequest().getContextPath() + (base.startsWith("images/") ? Functions.getResourcePath() : "") + '/' + base;
-
             String url =  Functions.getActionUrl(req.findAncestor(ModelObject.class).getUrl(), a);
 
-            return add(url, icon, text);
+            if (base.startsWith("symbol-")) {
+                Icon icon = Functions.tryGetIcon(base);
+                return add(url, icon.getClassSpec(), text);
+            } else {
+                String icon = Stapler.getCurrentRequest().getContextPath() + (base.startsWith("images/") ? Functions.getResourcePath() : "") + '/' + base;
+                return add(url, icon, text);
+            }
         }
 
         public ContextMenu add(String url, String icon, String text) {

diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
@@ -77,16 +77,22 @@ private static String prependTitleIfRequired(String icon, String title) {
 
     // for Jelly
     @Restricted(NoExternalUse.class)
-    public static String getSymbol(String name, String title, String classes) {
-        if (SYMBOLS.containsKey(name)) {
-            String symbol = SYMBOLS.get(name);
+    public static String getSymbol(String name, String title, String tooltip, String classes) {
+        String translatedName = cleanName(name);
+
+        if (SYMBOLS.containsKey(translatedName)) {
+            String symbol = SYMBOLS.get(translatedName);
             symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
+            symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "");
+            if (!tooltip.isEmpty()) {
+                symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + tooltip + "\"");
+            }
             symbol = symbol.replaceAll("<svg", "<svg class=\"" + classes + "\"");
             return prependTitleIfRequired(symbol, title);
         }
 
         // Load symbol if it exists
-        InputStream inputStream = IconSet.class.getResourceAsStream("/images/symbols/" + name + ".svg");
+        InputStream inputStream = IconSet.class.getResourceAsStream("/images/symbols/" + translatedName + ".svg");
         String symbol = null;
 
         try {
@@ -102,11 +108,15 @@ public static String getSymbol(String name, String title, String classes) {
 
         symbol = symbol.replaceAll("(<title>)[^&]*(</title>)", "$1$2");
         symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
+        symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "$1$2");
+        if (!tooltip.isEmpty()) {
+            symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + tooltip + "\"");
+        }
         symbol = symbol.replaceAll("<svg", "<svg aria-hidden=\"true\"");
         symbol = symbol.replaceAll("<svg", "<svg class=\"" + classes + "\"");
         symbol = symbol.replace("stroke:#000", "stroke:currentColor");
 
-        SYMBOLS.put(name, symbol);
+        SYMBOLS.put(translatedName, symbol);
 
         return prependTitleIfRequired(symbol, title);
     }
@@ -535,19 +545,39 @@ private static void initializeSVGs() {
      */
     @Restricted(NoExternalUse.class)
     public static String tryTranslateTangoIconToSymbol(String tangoIcon) {
-        if (tangoIcon != null) {
-            tangoIcon = tangoIcon.split(" ")[0];
-        }
 
         Map<String, String> translations = new HashMap<>();
+        translations.put("icon-application-certificate", "symbol-ribbon");
+        translations.put("icon-document", "symbol-document-text");
+        translations.put("icon-clipboard", "symbol-logs");
         translations.put("icon-clock", "symbol-play");
         translations.put("icon-edit-delete", "symbol-trash");
+        translations.put("icon-fingerprint", "symbol-fingerprint");
+        translations.put("icon-folder", "symbol-folder");
         translations.put("icon-gear", "symbol-settings");
         translations.put("icon-gear2", "symbol-settings");
+        translations.put("icon-help", "symbol-help-circle");
+        translations.put("icon-keys", "symbol-key");
+        translations.put("icon-monitor", "symbol-terminal");
+        translations.put("icon-new-package", "symbol-add");
+        translations.put("icon-next", "symbol-arrow-right");
         translations.put("icon-plugin", "symbol-plugins");
+        translations.put("icon-previous", "symbol-arrow-left");
+        translations.put("icon-search", "symbol-search");
+        translations.put("icon-setting", "symbol-build");
+        translations.put("icon-terminal", "symbol-terminal");
+        translations.put("icon-text", "symbol-details");
         translations.put("icon-up", "symbol-arrow-up");
-        translations.put("icon-help", "symbol-help-circle");
+        translations.put("icon-user", "symbol-people");
+
+        String cleanedTangoIcon = cleanName(tangoIcon);
+        return translations.getOrDefault(cleanedTangoIcon, null);
+    }
 
-        return translations.getOrDefault(tangoIcon, null);
+    private static String cleanName(String tangoIcon) {
+        if (tangoIcon != null) {
+            tangoIcon = tangoIcon.split(" ")[0];
+        }
+        return tangoIcon;
     }
 }
diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.groovy b/core/src/main/resources/hudson/PluginManager/sidepanel.groovy
@@ -30,7 +30,7 @@ l.side_panel {
         l.task(icon:"icon-up icon-md", href:rootURL+'/', title:_("Back to Dashboard"))
         l.task(icon:"symbol-settings", href:"${rootURL}/manage", title:_("Manage Jenkins"))
         if (!app.updateCenter.jobs.isEmpty()) {
-            l.task(icon:"icon-plugin icon-md", href:"${rootURL}/updateCenter/", title:_("Update Center"))
+            l.task(icon: "symbol-download", href:"${rootURL}/updateCenter/", title:_("Update Center"))
         }
     }
 }
diff --git a/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly b/core/src/main/resources/hudson/diagnosis/MemoryUsageMonitor/index.jelly
@@ -29,7 +29,6 @@ THE SOFTWARE.
     <!-- TODO: st:include page="sidepanel.jelly" /-->
     <l:main-panel>
       <h1>
-        <l:icon class="icon-monitor icon-xlg"/>
         ${%JVM Memory Usage}
       </h1>
       <j:set var="type" value="${request.getParameter('type') ?: 'min'}" />

diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly b/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
@@ -29,8 +29,12 @@ THE SOFTWARE.
 <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">
 <l:layout permission="${app.ADMINISTER}" title="${%Configure Log Recorder}">
   <st:include page="sidepanel.jelly" />
+  <l:app-bar title="${%Configure log recorder}">
+    <a class="jenkins-button" tooltip="${%Additional information on log levels}" href="${%url}">
+      <l:icon src="symbol-help-circle" />
+    </a>
+  </l:app-bar>
   <l:main-panel>
-    <h1>${%Configure log recorder} <t:help iconSize="large" href="https://www.jenkins.io/redirect/log-recorders" /></h1>
     <p>
       ${%Enter the name of the logger you want to enable}.
     </p>

diff --git a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
 <l:layout title="Log" permission="${app.SYSTEM_READ}">
   <st:include page="sidepanel.jelly" />
   <l:main-panel>
-    <h1><l:icon class="icon-clipboard icon-xlg"/>${it.displayName}</h1>
+    <h1>${it.displayName}</h1>
     <t:logRecords logRecords="${it.logRecords}"/>
     <j:forEach var="entry" items="${it.slaveLogRecords.entrySet()}">
       <h2><a href="${rootURL}/${entry.key.url}" class="model-link">${entry.key.displayName}</a></h2>

diff --git a/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorder/sidepanel.jelly
@@ -31,7 +31,7 @@ THE SOFTWARE.
   <l:side-panel>
     <l:tasks>
       <l:task href=".." icon="icon-up icon-md" title="${%Back to Loggers}"/>
-      <l:task href="." icon="icon-notepad icon-md" title="${%Log records}"/>
+      <l:task href="." icon="symbol-file-tray" title="${%Log records}"/>
       <l:isAdmin>
         <l:task href="configure" icon="symbol-settings" title="${%Configure}"/>
         <l:task href="delete" icon="icon-edit-delete icon-md" title="${%Delete}"/>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/all.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
 <l:layout title="Log">
   <st:include page="sidepanel.jelly" />
   <l:main-panel>
-    <h1><l:icon class="icon-clipboard icon-xlg"/>${%Jenkins Log}</h1>
+    <h1>${%Jenkins Log}</h1>
     <div class="alert alert-info">
       Log messages at a level lower than INFO are never recorded in the Jenkins log. Use <a href=".">log recorders</a> to record these log messages.
     </div>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
@@ -28,22 +28,19 @@ THE SOFTWARE.
     <div align="right">
         <a href="rss" class="yui-button link-button">
             <span class="leading-icon">
-                <l:svgIcon class="icon-small" tooltip="Atom feed" viewBox="0 0 16 16"
-                           href="${imagesURL}/material-icons/feed.svg#feed"/>
+              <l:icon src="symbol-rss" />
             </span>
             <span>${%All}</span>
         </a>
         <a href="rss?level=SEVERE" class="yui-button link-button">
             <span class="leading-icon">
-                <l:svgIcon class="icon-small" tooltip="Atom feed" viewBox="0 0 16 16"
-                           href="${imagesURL}/material-icons/feed.svg#feed"/>
+              <l:icon src="symbol-rss" />
             </span>
             <span>${%SEVERE}</span>
         </a>
         <a href="rss?level=WARNING" class="yui-button link-button">
             <span class="leading-icon">
-                <l:svgIcon class="icon-small" tooltip="Atom feed" viewBox="0 0 16 16"
-                           href="${imagesURL}/material-icons/feed.svg#feed"/>
+              <l:icon src="symbol-rss" />
             </span>
             <span>${%WARNING}</span>
         </a>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly
@@ -28,17 +28,19 @@ 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">
 <l:layout title="${%Log}">
+  <l:app-bar title="${%Log Recorders}">
+    <l:isAdmin>
+      <a href="new" class="jenkins-button jenkins-button--primary">
+        <l:icon src="symbol-add" />
+        ${%Add new log recorder}
+      </a>
+    </l:isAdmin>
+    <a class="jenkins-button" tooltip="${%Additional information on log recorders}" href="https://www.jenkins.io/redirect/log-recorders">
+      <l:icon src="symbol-help-circle" />
+    </a>
+  </l:app-bar>
   <st:include page="sidepanel.jelly" />
   <l:main-panel xmlns:local="local">
-    <div class="jenkins-app-bar">
-      <div class="jenkins-app-bar__content">
-        <h1>
-          ${%Log Recorders}
-          <t:help iconSize="large" tooltip="${%Additional information on log recorders}" href="https://www.jenkins.io/redirect/log-recorders"/>
-        </h1>
-      </div>
-    </div>
-
     <d:taglib uri="local">
       <d:tag name="row">
         <tr>
@@ -72,13 +74,6 @@ THE SOFTWARE.
         </j:forEach>
       </tbody>
     </table>
-    <l:isAdmin>
-      <form method="get" action="new">
-        <p>
-          <f:submit value="${%Add new log recorder}" />
-        </p>
-      </form>
-    </l:isAdmin>
   </l:main-panel>
 </l:layout>
 </j:jelly>
diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/levels.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/levels.jelly
@@ -27,14 +27,17 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-<l:layout title="Log Levels">
+<l:layout title="${%Logger Configuration}">
+  <l:app-bar title="${%Logger Configuration}">
+    <a class="jenkins-button" tooltip="${%Additional information on log levels}" href="${%url}">
+      <l:icon src="symbol-help-circle" />
+    </a>
+  </l:app-bar>
+
   <st:include page="sidepanel.jelly" />
+
   <l:main-panel>
-    <h1>
-      ${%Logger Configuration}
-      <t:help iconSize="large" tooltip="${%Additional information on log levels}" href="${%url}" />
-    </h1>
-    <table class="sortable pane jenkins-table" id="logLevels">
+    <table class="sortable jenkins-table" id="logLevels">
       <thead>
         <tr>
           <th>${%Name}</th>

diff --git a/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly b/core/src/main/resources/hudson/logging/LogRecorderManager/sidepanel.jelly
@@ -32,12 +32,8 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:task href="${rootURL}/manage" icon="symbol-settings" title="${%Manage Jenkins}"/>
-      <l:task href="." icon="icon-clipboard icon-md" title="${%Log Recorders}">
-        <l:isAdmin>
-          <l:task href="new" icon="icon-new-package icon-md" title="${%New Log Recorder}"/>
-        </l:isAdmin>
-      </l:task>
-      <l:task href="all" icon="icon-notepad icon-md" title="${%All Log Messages}"/>
+      <l:task href="." icon="icon-clipboard icon-md" title="${%Log Recorders}"/>
+      <l:task href="all" icon="symbol-file-tray" title="${%All Log Messages}"/>
       <l:task href="levels" icon="symbol-settings" title="${%Log Levels}"/>
     </l:tasks>
   </l:side-panel>

diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
@@ -58,7 +58,7 @@ THE SOFTWARE.
           permission="${it.ARTIFACTS}" />
 
         <j:set var="set" value="${it.changeSet}" />
-        <t:summary icon="notepad.png">
+        <t:summary icon="symbol-changes">
           <j:choose>
             <j:when test="${it.hasChangeSetComputed()}">
               <st:include it="${set}" page="digest.jelly" />