Merge remote-tracking branch 'upstream/master' into alert-banners

.github/workflows/changelog.yml

@@ -17,13 +17,13 @@ jobs:
         id: release-drafter
         uses: release-drafter/release-drafter@v5.6.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.JENKINS_CHANGELOG_GENERATOR_TOKEN }}
       # Generates a YAML changelog file using https://github.com/jenkinsci/jenkins-core-changelog-generator
       - name: Generate YAML changelog draft
         id: jenkins-core-changelog-generator
         uses: jenkinsci/jenkins-core-changelog-generator@master
         env:
-          GITHUB_AUTH: github-actions:${{ secrets.GITHUB_TOKEN }}
+          GITHUB_AUTH: github-actions:${{ secrets.JENKINS_CHANGELOG_GENERATOR_TOKEN }}
       - name: Upload Changelog YAML
         uses: actions/upload-artifact@v1
         with:

core/src/main/java/hudson/model/AbstractCIBase.java

@@ -89,17 +89,31 @@ public abstract class AbstractCIBase extends Node implements ItemGroup<TopLevelI
         c.kill();
     }
 
-    /* =================================================================================================================
-    * Package-protected, but accessed API
-    * ============================================================================================================== */
+    private final Set<String> disabledAdministrativeMonitors = new HashSet<>();
 
-    /*package*/ final CopyOnWriteArraySet<String> disabledAdministrativeMonitors = new CopyOnWriteArraySet<>();
+    /**
+     * Get the disabled administrative monitors
+     *
+     * @since TODO
+     */
+    public Set<String> getDisabledAdministrativeMonitors(){
+        synchronized (this.disabledAdministrativeMonitors) {
+            return new HashSet<>(disabledAdministrativeMonitors);
+        }
+    }
 
-    @Restricted(NoExternalUse.class)
-    public CopyOnWriteArraySet<String> getDisabledAdministrativeMonitors(){
-    	return disabledAdministrativeMonitors;
+    /**
+     * Set the disabled administrative monitors
+     *
+     * @since TODO
+     */
+    public void setDisabledAdministrativeMonitors(Set<String> disabledAdministrativeMonitors) {
+        synchronized (this.disabledAdministrativeMonitors) {
+            this.disabledAdministrativeMonitors.clear();
+            this.disabledAdministrativeMonitors.addAll(disabledAdministrativeMonitors);
+        }
     }
-    
+
     /* =================================================================================================================
      * Implementation provided
      * ============================================================================================================== */

core/src/main/java/hudson/model/AdministrativeMonitor.java

@@ -118,8 +118,12 @@ public abstract class AdministrativeMonitor extends AbstractModelObject implemen
     public void disable(boolean value) throws IOException {
         AbstractCIBase jenkins = Jenkins.get();
         Set<String> set = jenkins.getDisabledAdministrativeMonitors();
-        if(value)   set.add(id);
-        else        set.remove(id);
+        if (value) {
+            set.add(id);
+        } else {
+            set.remove(id);
+        }
+        jenkins.setDisabledAdministrativeMonitors(set);
         jenkins.save();
     }
 

core/src/main/java/jenkins/management/ShutdownLink.java

@@ -26,6 +26,7 @@ package jenkins.management;
 
 import hudson.Extension;
 import hudson.model.ManagementLink;
+import hudson.security.Permission;
 import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 
@@ -61,6 +62,12 @@ public class ShutdownLink extends ManagementLink {
         return true;
     }
 
+    @Nonnull
+    @Override
+    public Permission getRequiredPermission() {
+        return Jenkins.MANAGE;
+    }
+  
     @Nonnull
     @Override
     public Category getCategory() {

core/src/main/java/jenkins/model/Jenkins.java

@@ -3899,7 +3899,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     @RequirePOST
     public HttpRedirect doQuietDown(@QueryParameter boolean block, @QueryParameter int timeout) throws InterruptedException, IOException {
         synchronized (this) {
-            checkPermission(ADMINISTER);
+            checkPermission(MANAGE);
             isQuietingDown = true;
         }
         if (block) {
@@ -3917,9 +3917,9 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
     /**
      * Cancel previous quiet down Jenkins - preparation for a restart
      */
-    @RequirePOST // TODO the cancel link needs to be updated accordingly
+    @RequirePOST
     public synchronized HttpRedirect doCancelQuietDown() {
-        checkPermission(ADMINISTER);
+        checkPermission(MANAGE);
         isQuietingDown = false;
         getQueue().scheduleMaintenance();
         return new HttpRedirect(".");

core/src/main/resources/hudson/PluginManager/checkUpdates.jelly

-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Forcibly check updates
--->
-<?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="${%Update Center}" permission="${app.ADMINISTER}" forcedUpdateCheck="true">
-  <st:include page="sidepanel.jelly"/>
-  <l:main-panel>
-    <table style="width:100%; height:100%;">
-      <tr>
-        <td style="vertical-align: middle; text-align:center">
-          <h3>${%Checking Updates...} <span id="completionMarker" /></h3>
-          <a href=".">${%Go back to update center}</a>
-        </td>
-      </tr>
-    </table>
-    <script>
-      downloadService.siteCount = 0${app.updateCenter.sites.size()};
-      downloadService.completionHandler = function() {
-          if (--downloadService.siteCount &lt;= 0)
-            $$('completionMarker').innerHTML = "${%Done}";
-      }
-    </script>
-  </l:main-panel>
-</l:layout>
-</j:jelly>

core/src/main/resources/hudson/PluginManager/checkUpdates_bg.properties

-# The MIT License
-#
-# Bulgarian translation: Copyright (c) 2015, 2016, Alexander Shopov <ash@kambanaria.org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Go\ back\ to\ update\ center=\
- \u041a\u044a\u043c \u0441\u0430\u0439\u0442\u0430 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
-Update\ Center=\
- \u0421\u0430\u0439\u0442 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f
-Done=\
- \u0413\u043e\u0442\u043e\u0432\u043e
-Checking\ Updates...=\
- \u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f\u2026

core/src/main/resources/hudson/PluginManager/checkUpdates_da.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Done=Udf\u00f8rt
-Go\ back\ to\ update\ center=G\u00e5 tilbage til update center
-Checking\ Updates...=Checker for opdateringer...

core/src/main/resources/hudson/PluginManager/checkUpdates_de.properties

-Checking\ Updates...=Suche nach Updates...
-Go\ back\ to\ update\ center=Zurück zum Update-Center
-Done=Fertig
-Update\ Center=Update-Center

core/src/main/resources/hudson/PluginManager/checkUpdates_es.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Buscando actualizaciones ...
-Go\ back\ to\ update\ center=Volver al centro de actualizaciones.
-Done=Terminado
-Update\ Center=Centro de actualizaciones

core/src/main/resources/hudson/PluginManager/checkUpdates_fi.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Tarkastetaan p\u00E4ivityksi\u00E4...
-Done=Valmis
-Go\ back\ to\ update\ center=Palaa takaisin liit\u00E4nn\u00E4isten hallintaan

core/src/main/resources/hudson/PluginManager/checkUpdates_fr.properties

-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Recherche des mises à jour...
-Go\ back\ to\ update\ center=Retourner à la page principale des mises à jour
-Done=Terminé

core/src/main/resources/hudson/PluginManager/checkUpdates_it.properties

-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Controllo aggiornamenti in corso...
-Update\ Center=Centro aggiornamenti
-Done=Fatto
-Go\ back\ to\ update\ center=Torna al Centro aggiornamenti

core/src/main/resources/hudson/PluginManager/checkUpdates_ja.properties

-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=\u66f4\u65b0\u3092\u30c1\u30a7\u30c3\u30af\u4e2d...
-Go\ back\ to\ update\ center=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc\u3078\u623b\u308b
-Done=\u5b8c\u4e86
-Update\ Center=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30bb\u30f3\u30bf\u30fc

core/src/main/resources/hudson/PluginManager/checkUpdates_lv.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=P\u0101rbauda atjaunin\u0101jumus
-Done=Izpild\u012Bts
-Go\ back\ to\ update\ center=Atgriezties Atjaunin\u0101jumu Centr\u0101

core/src/main/resources/hudson/PluginManager/checkUpdates_nl.properties

-# The MIT License
-# 
-# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Wim Rosseel
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Zoekt actuele versies...
-Go\ back\ to\ update\ center=Ga terug naar het actualisatiecentrum
-Done=Klaar

core/src/main/resources/hudson/PluginManager/checkUpdates_pt_BR.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc., Cleiber Silva
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Procurando atualiza\u00e7\u00f5es...
-Done=Feito
-Go\ back\ to\ update\ center=Voltar \u00e0 central de atualiza\u00e7\u00f5es
-Update\ Center=Central de atualiza\u00e7\u00f5es

core/src/main/resources/hudson/PluginManager/checkUpdates_pt_PT.properties

-# This file is under the MIT License by authors
-
-Checking\ Updates...=Verificando por Atualiza\u00E7\u00F5es...
-Done=Finalizado
-Go\ back\ to\ update\ center=Voltar ao centro de atualiza\u00E7\u00E3o

core/src/main/resources/hudson/PluginManager/checkUpdates_ru.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439...
-Done=\u041E\u043A\u043E\u043D\u0447\u0435\u043D\u0430
-Go\ back\ to\ update\ center=\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u0432 \u0446\u0435\u043D\u0442\u0440 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0439

core/src/main/resources/hudson/PluginManager/checkUpdates_sk.properties

-# This file is under the MIT License by authors
-
-Checking\ Updates...=Kontrolujem aktualiz\u00E1cie...
-Done=Hotovo
-Go\ back\ to\ update\ center=Sp\u00E4\u0165 na str\u00E1nku aktualiz\u00E1ci\u00ED

core/src/main/resources/hudson/PluginManager/checkUpdates_sr.properties

-# This file is under the MIT License by authors
-
-Update\ Center=\u0426\u0435\u043D\u0442\u0430\u0440 \u0437\u0430 \u0410\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435
-Checking\ Updates...=\u041F\u0440\u043E\u0432\u0435\u0440\u0438 \u0430\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0430
-Done=\u0413\u043E\u0442\u043E\u0432\u043E
-Go\ back\ to\ update\ center=\u041D\u0430\u0437\u0430\u0434 \u043A\u0430 \u0446\u0435\u043D\u0442\u0440\u0443 \u0437\u0430 \u0430\u0436\u0443\u0440\u0438\u0440\u0430\u045A\u0435

core/src/main/resources/hudson/PluginManager/checkUpdates_sv_SE.properties

-# The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Checking\ Updates...=Letar efter uppdateringar...
-Done=Avslutat

core/src/main/resources/hudson/PluginManager/checkUpdates_zh_TW.properties

-# The MIT License
-#
-# Copyright (c) 2004-2013, Sun Microsystems, Inc., Chunghwa Telecom Co., Ltd.,
-# and Pei-Tang Huang
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-Update\ Center=\u66f4\u65b0\u4e2d\u5fc3
-Checking\ Updates...=\u6b63\u5728\u6aa2\u67e5\u66f4\u65b0...
-Go\ back\ to\ update\ center=\u56de\u5230\u66f4\u65b0\u4e2d\u5fc3
-Done=\u5b8c\u6210

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

@@ -51,7 +51,7 @@ THE SOFTWARE.
       <tr>
         <td class="pane" colspan="2" style="white-space: normal;">
           ${%Jenkins is going to shut down. No further builds will be performed.}
-          <j:if test="${h.hasPermission(app.ADMINISTER)}">
+          <j:if test="${h.hasPermission(app.MANAGE)}">
             <f:link href="${rootURL}/cancelQuietDown" post="true">(${%cancel})</f:link>
           </j:if>
         </td>

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

@@ -230,23 +230,33 @@ THE SOFTWARE.
     </div>
 
     <j:if test="${layoutType!='full-screen'}">
-    <footer>
+    <footer class="page-footer">
       <div class="container-fluid">
-        <div class="row">
-          <div class="col-md-6" id="footer"></div>
-          <div class="col-md-18">
-            <span class="page_generated">${%Page generated}: <i:formatDate value="${h.getCurrentTime()}" type="both" dateStyle="medium" timeStyle="long"/></span>
-            <j:if test="${!empty(it.api)}">
-               <span class="rest_api"><a href="api/">REST API</a></span>
-            </j:if>
-            <span class="jenkins_ver"><a href="${h.getFooterURL()}">Jenkins ver. ${h.version}</a></span>
-            <j:if test="${extensionsAvailable}">
-            <j:forEach var="pd" items="${h.pageDecorators}">
-              <st:include it="${pd}" page="footer.jelly" optional="true" />
-            </j:forEach>
-            </j:if>
+        <div class="page-footer__flex-row">
+          <div class="page-footer__footer-id-placeholder" id="footer"></div>
+
+          <div class="page-footer__timestamp hidden-xs hidden-sm">
+            <span class="page-footer__generated">
+              ${%Page generated}:
+              <span class="page-footer__generated-timestamp"><i:formatDate value="${h.getCurrentTime()}" type="both" dateStyle="medium" timeStyle="long"/></span>
+            </span>
+          </div>
+
+          <j:if test="${!empty(it.api)}">
+            <div class="page-footer__links rest_api hidden-xs">
+              <a href="api/">REST API</a>
+            </div>
+          </j:if>
+
+          <div class="page-footer__links page-footer__links--white jenkins_ver">
+            <a href="${h.getFooterURL()}" target="_blank">Jenkins ${h.version}</a>
           </div>
         </div>
+        <j:if test="${extensionsAvailable}">
+          <j:forEach var="pd" items="${h.pageDecorators}">
+            <st:include it="${pd}" page="footer.jelly" optional="true" />
+          </j:forEach>
+        </j:if>
       </div>
     </footer>
     </j:if>

pom.xml

@@ -76,7 +76,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.229</revision>
+    <revision>2.230</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,

war/src/main/less/abstracts/colors.less

+@white: #fff;
+
 // Page header colors
-@logo-bg: white;
+@logo-bg: @white;
 @brand-link-color: #4d545d;
-@header-link-color: white;
+@header-link-color: @white;
 @header-link-color-active: #f5f5f5;
 @header-link-outline: #3FB3F7;
 @search-input-color: @brand-link-color;
-@search-background: white;
+@search-background: @white;
 @search-box-completion-bg: #0587d4;
 @search-box-shadow: 0 1px 7px 0 rgba(0,0,0,0.3);
 
@@ -54,4 +56,6 @@
 @alert-err-color: #721c24;
 
 // Typography
-@text-color: #333;
\ No newline at end of file
+@text-color: #333;
+@text-color-primary: #0B6AA2;
+@text-color-primary-accent: #095683;

war/src/main/less/base-styles-v2.less

@@ -24,5 +24,6 @@ html {
 // Keep page header code in this bundle to avoid loading multiple files
 // that are always needed
 @import './modules/page-header.less';
+@import './modules/page-footer.less';
 
 @import './modules/manage-jenkins.less';

war/src/main/less/base/layout-commons.less

@@ -99,24 +99,4 @@ body.full-screen #main-panel {
   }
 }
 
-/* --------------- footer --------------- */
-
-footer {
-  padding: 11px 0;
-  background-color: @breadcrumbs-bg;
-  border-top: 1px solid @breadcrumbs-border;
-  border-bottom: 1px solid @breadcrumbs-bg;
-  width: 100%;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  clear: both;
-  font-size: @font-size-xs;
-  text-align: right;
-}
-
-footer span {
-  margin-left: 15px;
-}
-
 /* -------------------------------------- */

war/src/main/less/modules/page-footer.less

+@import '../abstracts/font.less';
+@import '../abstracts/colors.less';
+
+.page-footer {
+  background-color: @breadcrumbs-bg;
+  border-top: 1px solid @breadcrumbs-border;
+  width: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  clear: both;
+  font-size: @font-size-sm;
+}
+
+.page-footer .container-fluid {
+  padding: 0;
+}
+
+.page-footer__flex-row {
+  min-height: 3.5rem;
+  display: block;
+  display: flex;
+  align-items: stretch;
+  flex-wrap: wrap;
+}
+
+.page-footer__flex-row > * {
+  padding: 0.5rem 1.25rem;
+  display: flex;
+  align-items: center;
+}
+
+.page-footer__footer-id-placeholder {
+  flex: 1;
+  flex-wrap: wrap;
+}
+
+.page-footer span {
+  display: inline-block;
+}
+
+.page-footer__generated {
+  font-weight: bold;
+}
+
+.page-footer .page-footer__generated-timestamp {
+  font-weight: normal;
+  margin: 0;
+  padding-left: 0.25rem;
+}
+
+.page-footer__links {
+  &:not(:last-child) {
+    border-right: 1px solid @breadcrumbs-bg;
+  }
+
+  &--white {
+    background: @white;
+  }
+}
+
+.page-footer a {
+  &:link,
+  &:visited {
+    font-weight: 600;
+    text-decoration: none;
+    color: @text-color;
+  }
+
+  &:focus,
+  &:hover {
+    color: @text-color-primary;
+    text-decoration: underline;
+  }
+
+  &:active {
+    color: @text-color-primary-accent;
+    text-decoration: underline;
+  }
+}