Merge branches 'renovate/org.jenkins-ci.plugins-credentials-1460.x', 'renovate/major-stapler.version', 'renovate/io.jenkins.plugins-jaxb-2.x', 'renovate/io.jenkins.plugins-jakarta-xml-bind-api-4.x', 'renovate/io.jenkins.plugins-checks-api-402.x', 'renovate/io.jenkins.lib-support-log-formatter-121.x', 'renovate/com.puppycrawl.tools-checkstyle-12.x', 'jdk-telemetry', 'bump-remoting' and 'Pnkcaht/master' into aardvark-octopus

Author: MarkEWaite

.github/renovate.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>jenkinsci/renovate-config"],
+  "extends": ["github>jenkinsci/renovate-config", "schedule:daily"],
   "prHourlyLimit": 0,
   "prConcurrentLimit": 0,
   "packageRules": [

CONTRIBUTING.md

@@ -9,8 +9,8 @@ This page provides information about contributing code to the Jenkins core codeb
 1. Fork the repository on GitHub
 2. Clone the forked repository to your machine
 3. Install the necessary development tools. In order to develop Jenkins, you need the following:
-   - Java Development Kit (JDK) 17 or 21.
-     In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.java.net/), but you can use other JDKs as well.
+   - Java Development Kit (JDK) 21 or 25.
+     In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.org/), but you can use other JDKs as well.
    - Apache Maven 3.9.6 or above. You can [download Maven here](https://maven.apache.org/download.cgi).
      In the Jenkins project we usually use the most recent Maven release.
    - Any IDE which supports importing Maven projects.

bom/pom.xml

@@ -41,7 +41,7 @@ THE SOFTWARE.
     <commons-fileupload2.version>2.0.0-M4</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20250731</jelly.version>
-    <stapler.version>2061.v3949245133a_f</stapler.version>
+    <stapler.version>2065.v7db_c1fcf0a_d0</stapler.version>
   </properties>
 
   <dependencyManagement>

core/pom.xml

@@ -40,7 +40,7 @@ THE SOFTWARE.
 
   <properties>
     <!-- Minimum Remoting version, which is tested for API compatibility, duplicated so that renovate only updates the latest remoting version property -->
-    <remoting.minimum.supported.version>3107.v665000b_51092</remoting.minimum.supported.version>
+    <remoting.minimum.supported.version>3176.v207ec082a_8c0</remoting.minimum.supported.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
   </properties>

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

@@ -1053,6 +1053,9 @@ public RunT getLastCompletedBuild() {
      */
     public List<RunT> getLastBuildsOverThreshold(int numberOfBuilds, Result threshold) {
         RunT r = getLastBuild();
+        if (r == null) {
+            return Collections.emptyList();
+        }
         return r.getBuildsOverThreshold(numberOfBuilds, threshold);
     }
 

core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java

@@ -356,22 +356,30 @@ private String getErrorMessages(SignupInfo si) {
         return messages.toString();
     }
 
+    /**
+     * Lock used to make initial admin account creation atomic.
+     */
+    private static final Object CREATE_FIRST_ACCOUNT_LOCK = new Object();
+
     /**
      * Creates a first admin user account.
      *
      * <p>
      * This can be run by anyone, but only to create the very first user account.
      */
     @RequirePOST
-    public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
-        if (hasSomeUser()) {
-            rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
-            return;
-        }
-        User u = createAccount(req, rsp, false, "firstUser.jelly");
-        if (u != null) {
-            tryToMakeAdmin(u);
-            loginAndTakeBack(req, rsp, u);
+    public void doCreateFirstAccount(StaplerRequest2 req, StaplerResponse2 rsp)
+            throws IOException, ServletException {
+        synchronized (CREATE_FIRST_ACCOUNT_LOCK) {
+            if (hasSomeUser()) {
+                rsp.sendError(SC_UNAUTHORIZED, "First user was already created");
+                return;
+            }
+            User u = createAccount(req, rsp, false, "firstUser.jelly");
+            if (u != null) {
+                tryToMakeAdmin(u);
+                loginAndTakeBack(req, rsp, u);
+            }
         }
     }
 

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

@@ -78,7 +78,6 @@ public class JavaVersionRecommendationAdminMonitor extends AdministrativeMonitor
 
     static {
         NavigableMap<Integer, LocalDate> supportedVersions = new TreeMap<>();
-        supportedVersions.put(17, LocalDate.of(2026, 3, 31)); // Temurin: 2027-10-31
         supportedVersions.put(21, LocalDate.of(2027, 9, 30)); // Temurin: 2029-09-30
         supportedVersions.put(25, LocalDate.of(2029, 9, 30)); // Temurin: 2031-09-30
         SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableNavigableMap(supportedVersions);

core/src/main/java/jenkins/security/stapler/StaplerDispatchValidator.java

@@ -311,7 +311,6 @@ private void loadWhitelist(@NonNull List<String> whitelistLines) {
             }
         }
 
-        @SuppressFBWarnings(value = "SIC_INNER_SHOULD_BE_STATIC", justification = "TODO needs triage")
         private class Validator {
             // lazy load parents to avoid trying to load potentially unavailable classes
             private final Supplier<Collection<Validator>> parentsSupplier;

core/src/main/java/jenkins/telemetry/impl/JavaSystemProperties.java

@@ -70,13 +70,13 @@ public String getDisplayName() {
     @NonNull
     @Override
     public LocalDate getStart() {
-        return LocalDate.of(2023, 12, 17);
+        return LocalDate.of(2026, 1, 4);
     }
 
     @NonNull
     @Override
     public LocalDate getEnd() {
-        return LocalDate.of(2024, 4, 1);
+        return LocalDate.of(2026, 4, 1);
     }
 
     @Override

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.142</version>
+    <version>2.1326.v00b_e26755312</version>
     <relativePath />
   </parent>
 
@@ -281,7 +281,7 @@ THE SOFTWARE.
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>12.3.0</version>
+              <version>12.3.1</version>
             </dependency>
           </dependencies>
           <executions>