Merge branch 'master' into move-manage-jenkins-less

core/src/main/java/hudson/PluginManager.java

@@ -1437,7 +1437,7 @@ public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParamete
                         jsonObject.put("releaseTimestamp", releaseTimestamp);
                     }
                     if (hasLatestVersionNewerThanOffered(plugin)) {
-                        jsonObject.put("newerVersionAvailableNotOffered", Messages.PluginManager_newerVersionExists(plugin.latest));
+                        jsonObject.put("newerVersionAvailableNotOffered", Messages.PluginManager_newerVersionExists(plugin.latest, plugin.wiki));
                     }
                     return jsonObject;
                 })

core/src/main/resources/hudson/Messages.properties

@@ -91,12 +91,10 @@ PluginManager.adoptThisPlugin=\
   <strong>This plugin is up for adoption!</strong> We are looking for new maintainers. \
   Visit our <a href="https://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel="noopener noreferrer" target="_blank">Adopt a Plugin</a> initiative for more information.
 PluginManager.newerVersionExists=\
-  A newer version than being offered for installation exists (version {0}). \
-  This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied.
-PluginManager.newerVersionEntry=\
-  This version of the plugin exists but it is not being offered as an update. \
+  A newer version than being offered for installation exists (version {0}), so the latest bug fixes or features are not available to you. \
   This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \
-  See the <a href="{0}" rel="noopener noreferrer" target="_blank">plugin documentation</a> for information about its requirements.
+  If you are using the latest version of Jenkins offered to you, this plugin release may not be available to your release line yet. \
+  See the <a href="{1}" rel="noopener noreferrer" target="_blank">plugin documentation</a> for information about its requirements.
 PluginManager.unavailable=Unavailable
 PluginManager.deprecationWarning=<strong>This plugin is deprecated.</strong> In general, this means that it is either obsolete, no longer being developed, or may no longer work. <a href="{0}" rel="noopener noreferrer" target="_blank">Learn more.</a>
 PluginManager.insecureUrl=\

core/src/main/resources/hudson/Messages_es.properties

@@ -91,13 +91,6 @@ PluginManager.ago=Hace {0}
 PluginManager.adoptThisPlugin=\
   <strong>\u00a1Este plugin est\u00e1 en adopci\u00f3n!</strong> Buscamos nuevos mantenedores. \
   Visita nuestro sitio de la iniciativa <a href="https://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel="noopener noreferrer" target="_blank">Adopte un plugin</a> para obtener m\u00e1s informaci\u00f3n.
-PluginManager.newerVersionExists=\
-  Existe una versi\u00f3n m\u00e1s nueva que la que se ofrece para la instalaci\u00f3n (versi\u00f3n {0}). \
-  Este es el t\u00edpico caso en el que no se satisfacen los requisitos del plugin, por ejemplo, una versi\u00f3n m\u00e1s reciente de Jenkins es necesaria.
-PluginManager.newerVersionEntry=\
-  Esta versi\u00f3n del plugin existe pero no se ofrece como actualizaci\u00f3n. \
-  Este es el t\u00edpico caso en el que no se satisfacen los requisitos del plugin, por ejemplo, una versi\u00f3n m\u00e1s reciente de Jenkins es necesaria. \
-  Consulte la <a href="{0}" rel="noopener noreferrer" target="_blank">documentaci\u00f3n del plugin</a> para obtener informaci\u00f3n sobre sus requisitos.
 PluginManager.unavailable=No disponible
 PluginManager.deprecationWarning=<strong>Este plugin est\u00e1 obsoleto.</strong> En general, esto significa que ya no se desarrolla o que puede dejar de funcionar. <a href="{0}" rel="noopener noreferrer" target="_blank">M\u00e1s informaci\u00f3n</a>
 

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

@@ -206,7 +206,7 @@ THE SOFTWARE.
                     </j:if>
                     <j:if test="${it.hasLatestVersionNewerThanOffered(p)}">
                       <div class="alert alert-info">
-                        ${%newerVersionExists(p.latest)}
+                        ${%newerVersionExists(p.latest, p.wiki)}
                       </div>
                     </j:if>
                   </td>

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

@@ -48,7 +48,7 @@ newerVersionExists=\
   A newer version than being offered for installation exists (version {0}), so the latest bug fixes or features are not available to you. \
   This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \
   If you are using the latest version of Jenkins offered to you, this plugin release may not be available to your release line yet. \
-  See the <a href="{0}" rel="noopener noreferrer" target="_blank">plugin documentation</a> for information about its requirements.
+  See the <a href="{1}" rel="noopener noreferrer" target="_blank">plugin documentation</a> for information about its requirements.
 newerVersionEntry=\
   This version of the plugin exists but it is not being offered for installation, so the latest bug fixes or features are not available to you. \
   This is typically the case when plugin requirements, e.g. a recent version of Jenkins, are not satisfied. \

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

@@ -70,16 +70,6 @@ instructions=Utilizzare la casella di ricerca soprastante per cercare i \
   componenti aggiuntivi disponibili.
 loading=Caricamento elenco componenti aggiuntivi in corso...
 Name=Nome
-newerVersionEntry=Questa versione del componente aggiuntivo esiste ma non è \
-  offerta come aggiornamento. Questo è il caso tipico se non sono soddisfatti \
-  dei requisiti relativi ai componenti aggiuntivi, ad es. disporre di una \
-  versione recente di Jenkins. Si veda la \
-  <a href="{0}" rel="noopener noreferrer" target="_blank">documentazione del componente aggiuntivo</a> \
-  per ulteriori informazioni relative ai suoi requisiti.
-newerVersionExists=Per questo componente aggiuntivo esiste una versione più \
-  recente di quella offerta per l''installazione (versione {0}). Questo è il \
-  caso tipico se non sono soddisfatti dei requisiti relativi ai componenti \
-  aggiuntivi, ad es. disporre di una versione recente di Jenkins.
 No\ updates=Nessun aggiornamento disponibile
 parentCompatWarning=I seguenti componenti aggiuntivi sono affetti da questo \
   problema:

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

@@ -40,9 +40,5 @@ ago={0} temu
 adoptThisPlugin=\
   <strong>Ta wtyczka czeka na adopcje!</strong> Szukamy os\u00F3b ch\u0119tnych rozwija\u0107 t\u0119 wtyczk\u0119. \
   Przeczytaj nasz\u0105 inicjatyw\u0119 <a href="https://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel="noopener noreferrer" target="_blank">Adopt a Plugin</a>, aby uzyska\u0107 wi\u0119cej informacji.
-newerVersionEntry=\
-  Ta wersja wtyczki istnieje, ale nie jest dost\u0119pna jej aktualizacja. \
-  Najcz\u0119\u015Bciej jest to spowodowane tym, \u017Ce np. wtyczka wymaga nowszej wersji Jenkinsa, co nie jest spe\u0142nione. \
-  Sprawd\u017A <a href="{0}" rel="noopener noreferrer" target="_blank">dokumentacje wtyczki</a> celem weryfikacji tych wymaga\u0144.
 unavailable=Niedost\u0119pna
-Applying\ this\ update\ will\ address\ security\ vulnerabilities\ in\ the\ currently\ installed\ version.=Zainstalowanie tej aktualizacji usunie podatno\u015Bci wyst\u0119puj\u0105ce w aktualnie zainstalowanej wersji.
+Applying\ this\ update\ will\ address\ security\ vulnerabilities\ in\ the\ currently\ installed\ version.=Zainstalowanie tej aktualizacji usunie podatno\u015Bci wyst\u0119puj\u0105ce w aktualnie zainstalowanej wersji.

core/src/main/resources/hudson/model/User/error.jelly

@@ -0,0 +1,15 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
+  <l:layout title="Jenkins">
+    <l:header />
+    <l:side-panel>
+      <l:tasks>
+        <l:task href="configure" icon="icon-up icon-md" title="${%Back to user configuration}"/>
+      </l:tasks>
+    </l:side-panel>
+    <l:main-panel>
+      <h1>${%Error}</h1>
+      <p>${message}</p>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>

pom.xml

@@ -71,7 +71,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.355</revision>
+    <revision>2.356</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,
@@ -90,7 +90,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3025.vf64a_a_3da_6b_55</remoting.version>
+    <remoting.version>3028.va_a_436db_35078</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>3.14</remoting.minimum.supported.version>
 
@@ -102,7 +102,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.23</bridge-method-injector.version>
     <junit.jupiter.version>5.8.2</junit.jupiter.version>
     <mockito.version>4.6.1</mockito.version>
-    <spotless.version>2.22.7</spotless.version>
+    <spotless.version>2.22.8</spotless.version>
   </properties>
 
   <dependencyManagement>

war/src/main/webapp/scripts/sortable.js

@@ -368,7 +368,7 @@ var Sortable = (function() {
             if (itm.match(date_pattern)) sortfn = this.date;
             if (itm.match(/^[�$]/)) sortfn = this.currency;
             if (itm.match(/\%$/)) sortfn = this.percent;
-            if (itm.match(/^-?[\d\.]+$/)) sortfn = this.numeric;
+            if (itm.match(/^-?[\d]+(\.[\d]+)?$/)) sortfn = this.numeric;
             return sortfn;
         },