Merge branch 'master' into patch-1

.github/PULL_REQUEST_TEMPLATE.md

@@ -28,14 +28,16 @@ For refactoring and code cleanup changes, exercise the code before and after the
 
 ### Proposed changelog entries
 
-- \<replace with Issue ID if it exists or remove\>, human-readable text
+- JENKINS-XXXXX, human-readable text
 
 <!-- Comment:
 The changelog entry should be in the imperative mood; e.g., write "do this"/"return that" rather than "does this"/"returns that".
 For examples, see: https://www.jenkins.io/changelog/
 
+Remove JENKINS-XXXXX if there is no issue for the pull request.
+
 You may add multiple changelog entries if applicable by adding a new entry to the list, e.g.
-- First changelog entry
+- JENKINS-123456, First changelog entry
 - Second changelog entry
 -->
 

README.md

@@ -8,6 +8,7 @@
 [![Jenkins LTS Release](https://img.shields.io/endpoint?url=https%3A%2F%2Fwww.jenkins.io%2Fchangelog-stable%2Fbadge.json)](https://www.jenkins.io/changelog-stable)
 [![Docker Pulls](https://img.shields.io/docker/pulls/jenkins/jenkins.svg)](https://hub.docker.com/r/jenkins/jenkins/)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3538/badge)](https://bestpractices.coreinfrastructure.org/projects/3538)
+[![Gitter](https://img.shields.io/gitter/room/jenkinsci/jenkins)](https://app.gitter.im/#/room/#jenkinsci_jenkins:gitter.im)
 
 In a nutshell, Jenkins is the leading open-source automation server.
 Built with Java, it provides over 1,800 [plugins](https://plugins.jenkins.io/) to support automating virtually anything,

bom/pom.xml

@@ -38,7 +38,7 @@ THE SOFTWARE.
   <description>The module contains dependencies that are used by a specific Jenkins version</description>
 
   <properties>
-    <asm.version>9.5</asm.version>
+    <asm.version>9.6</asm.version>
     <slf4jVersion>2.0.9</slf4jVersion>
     <stapler.version>1814.vdc9dd5217ee2</stapler.version>
     <groovy.version>2.4.21</groovy.version>
@@ -128,7 +128,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.13.0</version>
+        <version>2.14.0</version>
       </dependency>
       <dependency>
         <groupId>commons-jelly</groupId>

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

@@ -499,6 +499,10 @@ public void clear() {
     }
 
     /*package*/ File getXMLQueueFile() {
+        String id = SystemProperties.getString(Queue.class.getName() + ".id");
+        if (id != null) {
+            return new File(Jenkins.get().getRootDir(), "queue/" + id + ".xml");
+        }
         return new File(Jenkins.get().getRootDir(), "queue.xml");
     }
 

core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java

@@ -115,7 +115,7 @@ private static String getId() {
 
     @Override
     public boolean isActivated() {
-        return !disabled && getDeprecationPeriod().getYears() < 2;
+        return !disabled && getDeprecationPeriod().toTotalMonths() < 18;
     }
 
     @Override
@@ -156,7 +156,7 @@ private static Period getDeprecationPeriod() {
 
     @NonNull
     private static Severity getSeverity() {
-        return getDeprecationPeriod().getYears() < 1 ? Severity.DANGER : Severity.WARNING;
+        return getDeprecationPeriod().toTotalMonths() < 9 ? Severity.DANGER : Severity.WARNING;
     }
 
     /**

core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/description.jelly

@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:st="jelly:stapler">
-    ${%blurb(it.javaVersion)}
+    ${%blurb}
 </j:jelly>

core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/description.properties

@@ -1 +1 @@
-blurb = Recommends Java {0,number} for running Jenkins if an older version is used.
+blurb = Recommends a Java upgrade for Jenkins if an older Java version is used.

core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/description_pt_BR.properties

@@ -20,4 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-blurb=Recomenda o Java {0,number} para executar o Jenkins se uma versão anterior está em uso.
+blurb=Recomenda uma atualização do Java para Jenkins se uma versão anterior do Java estiver em uso.

core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/description_ru.properties

@@ -1 +1 @@
-blurb = Рекомендует запускать Jenkins на Java {0,number}, если используется более старая версия.
+blurb = Рекомендует обновить Java для Jenkins, если используется более старая версия Java.

core/src/main/resources/jenkins/monitor/JavaVersionRecommendationAdminMonitor/description_zh_TW.properties

@@ -1 +1 @@
-blurb=若您使用的 Java 版本低於 {0,number}，推薦您改用 Java {0,number} 來執行 Jenkins。
+blurb=如果使用較舊的 Java 版本，建議對 Jenkins 進行 Java 升級。

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.105</version>
+    <version>1.106</version>
     <relativePath />
   </parent>
 
@@ -73,7 +73,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.426</revision>
+    <revision>2.427</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- configuration for patch tracker plugin  -->
@@ -93,9 +93,9 @@ THE SOFTWARE.
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>
 
-    <access-modifier.version>1.32</access-modifier.version>
+    <access-modifier.version>1.33</access-modifier.version>
     <antlr.version>4.13.1</antlr.version>
-    <bridge-method-injector.version>1.28</bridge-method-injector.version>
+    <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
     <winstone.version>6.13</winstone.version>
@@ -332,7 +332,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.12.3</version>
+              <version>10.12.4</version>
             </dependency>
           </dependencies>
           <executions>

test/pom.xml

@@ -89,7 +89,7 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps between checks-api, echarts-api, font-awesome-api, and junit -->
         <groupId>io.jenkins.plugins</groupId>
         <artifactId>plugin-util-api</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
@@ -100,14 +100,20 @@ THE SOFTWARE.
         <!-- RequireUpperBoundDeps via mailer and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>display-url-api</artifactId>
-        <version>2.3.9</version>
+        <version>2.200.vb_9327d658781</version>
       </dependency>
       <dependency>
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
         <version>1275.v23895f409fb_d</version>
       </dependency>
+      <dependency>
+        <!-- Required by plugin-util-api -->
+        <groupId>org.jenkins-ci.plugins.workflow</groupId>
+        <artifactId>workflow-support</artifactId>
+        <version>865.v43e78cc44e0d</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -196,7 +202,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
-      <version>1271.v54b_1c2c6388a_</version>
+      <version>1290.v2e5b_13eb_b_127</version>
       <scope>test</scope>
     </dependency>
     <dependency>