Merge upstream changes from jenkinsci/master

Author: LakshyaBagani

.github/workflows/announce-lts-rc.yml

@@ -17,7 +17,7 @@ jobs:
           discourse-author-username: jenkins-release-bot
           discourse-category: 23
       - name: Post on mailing list
-        uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c # v7
+        uses: dawidd6/action-send-mail@afe978662944c6805dd197bac88b27acb0bda55a # v8
         with:
           server_address: smtp.gmail.com
           server_port: 465

.github/workflows/changelog.yml

@@ -24,7 +24,7 @@ jobs:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Generate GitHub Release Draft
         id: release-drafter
-        uses: release-drafter/release-drafter@267d2e0268deae5d44f3ba5029dd4d6e85f9d52d # v6.1.1
+        uses: release-drafter/release-drafter@6db134d15f3909ccc9eefd369f02bd1e9cffdf97 # v6.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Generates a YAML changelog file using https://github.com/jenkinsci/jenkins-core-changelog-generator
@@ -52,7 +52,7 @@ jobs:
           owner: jenkins-infra
           repositories: jenkins.io
       - name: Check out
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
       - name: Publish jenkins.io changelog draft

.github/workflows/publish-release-artifact.yml

@@ -16,9 +16,9 @@ jobs:
       is-lts: ${{ steps.set-version.outputs.is-lts }}
       is-rc: ${{ steps.set-version.outputs.is-rc }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up JDK 21
-        uses: actions/setup-java@d81c4e45f3ac973cc936d79104023e20054ba578 #v 5.0.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v 5.0.0
         with:
           distribution: "temurin"
           java-version: 21
@@ -136,7 +136,7 @@ jobs:
           REPO=rpm
           if [ ${IS_LTS} = 'true' ]
           then
-            REPO=redhat-stable
+            REPO=rpm-stable
             FILE_NAME=jenkins-${PROJECT_VERSION}-1.1.noarch.rpm
           fi
 

.github/workflows/run-since-updater.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'jenkinsci' }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           fetch-depth: 0
       - name: Run update-since-todo.py
@@ -29,7 +29,7 @@ jobs:
         id: run_script
         shell: bash
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: Fill in since annotations

ath.sh

@@ -6,7 +6,7 @@ set -o xtrace
 cd "$(dirname "$0")"
 
 # https://github.com/jenkinsci/acceptance-test-harness/releases
-export ATH_VERSION=6518.v018e9d499cf2
+export ATH_VERSION=6535.v65db_170d2a_03
 
 if [[ $# -eq 0 ]]; then
 	export JDK=21

cli/pom.xml

@@ -15,7 +15,7 @@
   <url>https://github.com/jenkinsci/jenkins</url>
 
   <properties>
-    <mina-sshd.version>2.16.0</mina-sshd.version>
+    <mina-sshd.version>2.17.1</mina-sshd.version>
     <!-- Filled in by jacoco-maven-plugin -->
     <jacocoSurefireArgs />
   </properties>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.glassfish.tyrus.bundles</groupId>
       <artifactId>tyrus-standalone-client-jdk</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>

cli/src/main/java/hudson/cli/CLI.java

@@ -138,40 +138,45 @@ public static int _main(String[] _args) throws Exception {
 
         while (!args.isEmpty()) {
             String head = args.get(0);
-            if (head.equals("-version")) {
-                System.out.println("Version: " + computeVersion());
-                return 0;
-            }
-            if (head.equals("-http")) {
-                if (mode != null) {
-                    printUsage("-http clashes with previously defined mode " + mode);
-                    return -1;
+            switch (head) {
+                case "-version" -> {
+                    System.out.println("Version: " + computeVersion());
+                    return 0;
                 }
-                mode = Mode.HTTP;
-                args = args.subList(1, args.size());
-                continue;
-            }
-            if (head.equals("-ssh")) {
-                if (mode != null) {
-                    printUsage("-ssh clashes with previously defined mode " + mode);
-                    return -1;
+                case "-http" -> {
+                    if (mode != null) {
+                        printUsage("-http clashes with previously defined mode " + mode);
+                        return -1;
+                    }
+                    mode = Mode.HTTP;
+                    args = args.subList(1, args.size());
+                    continue;
                 }
-                mode = Mode.SSH;
-                args = args.subList(1, args.size());
-                continue;
-            }
-            if (head.equals("-webSocket")) {
-                if (mode != null) {
-                    printUsage("-webSocket clashes with previously defined mode " + mode);
+                case "-ssh" -> {
+                    if (mode != null) {
+                        printUsage("-ssh clashes with previously defined mode " + mode);
+                        return -1;
+                    }
+                    mode = Mode.SSH;
+                    args = args.subList(1, args.size());
+                    continue;
+                }
+                case "-webSocket" -> {
+                    if (mode != null) {
+                        printUsage("-webSocket clashes with previously defined mode " + mode);
+                        return -1;
+                    }
+                    mode = Mode.WEB_SOCKET;
+                    args = args.subList(1, args.size());
+                    continue;
+                }
+                case "-remoting" -> {
+                    printUsage("-remoting mode is no longer supported");
                     return -1;
                 }
-                mode = Mode.WEB_SOCKET;
-                args = args.subList(1, args.size());
-                continue;
-            }
-            if (head.equals("-remoting")) {
-                printUsage("-remoting mode is no longer supported");
-                return -1;
+                default -> {
+                    // continue
+                }
             }
             if (head.equals("-s") && args.size() >= 2) {
                 url = args.get(1);

cli/src/main/java/hudson/cli/PlainCLIProtocol.java

@@ -262,28 +262,33 @@ abstract static class ServerSide extends EitherSide {
         @Override
         protected final boolean handle(Op op, DataInputStream dis) throws IOException {
             assert op.clientSide;
-            switch (op) {
-            case ARG:
-                onArg(dis.readUTF());
-                return true;
-            case LOCALE:
-                onLocale(dis.readUTF());
-                return true;
-            case ENCODING:
-                onEncoding(dis.readUTF());
-                return true;
-            case START:
-                onStart();
-                return true;
-            case STDIN:
-                onStdin(dis.readAllBytes());
-                return true;
-            case END_STDIN:
-                onEndStdin();
-                return true;
-            default:
-                return false;
-            }
+            return switch (op) {
+                case ARG -> {
+                    onArg(dis.readUTF());
+                    yield true;
+                }
+                case LOCALE -> {
+                    onLocale(dis.readUTF());
+                    yield true;
+                }
+                case ENCODING -> {
+                    onEncoding(dis.readUTF());
+                    yield true;
+                }
+                case START -> {
+                    onStart();
+                    yield true;
+                }
+                case STDIN -> {
+                    onStdin(dis.readAllBytes());
+                    yield true;
+                }
+                case END_STDIN -> {
+                    onEndStdin();
+                    yield true;
+                }
+                default -> false;
+            };
         }
 
         protected abstract void onArg(String text);
@@ -321,19 +326,21 @@ abstract static class ClientSide extends EitherSide {
         @Override
         protected boolean handle(Op op, DataInputStream dis) throws IOException {
             assert !op.clientSide;
-            switch (op) {
-            case EXIT:
-                onExit(dis.readInt());
-                return true;
-            case STDOUT:
-                onStdout(dis.readAllBytes());
-                return true;
-            case STDERR:
-                onStderr(dis.readAllBytes());
-                return true;
-            default:
-                return false;
-            }
+            return switch (op) {
+                case EXIT -> {
+                    onExit(dis.readInt());
+                    yield true;
+                }
+                case STDOUT -> {
+                    onStdout(dis.readAllBytes());
+                    yield true;
+                }
+                case STDERR -> {
+                    onStderr(dis.readAllBytes());
+                    yield true;
+                }
+                default -> false;
+            };
         }
 
         protected abstract void onExit(int code);

cli/src/main/java/hudson/cli/SSHCLI.java

@@ -29,12 +29,10 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.util.QuotedStringTokenizer;
 import java.io.IOException;
-import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.KeyPair;
-import java.security.PublicKey;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -45,7 +43,6 @@
 import org.apache.sshd.client.future.ConnectFuture;
 import org.apache.sshd.client.keyverifier.DefaultKnownHostsServerKeyVerifier;
 import org.apache.sshd.client.keyverifier.KnownHostsServerKeyVerifier;
-import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.future.WaitableFuture;
 import org.apache.sshd.common.util.io.input.NoCloseInputStream;
@@ -86,12 +83,9 @@ static int sshConnection(String jenkinsUrl, String user, List<String> args, Priv
 
         try (SshClient client = SshClient.setUpDefaultClient()) {
 
-            KnownHostsServerKeyVerifier verifier = new DefaultKnownHostsServerKeyVerifier(new ServerKeyVerifier() {
-                @Override
-                public boolean verifyServerKey(ClientSession clientSession, SocketAddress remoteAddress, PublicKey serverKey) {
-                    CLI.LOGGER.log(Level.WARNING, "Unknown host key for {0}", remoteAddress.toString());
-                    return !strictHostKey;
-                }
+            KnownHostsServerKeyVerifier verifier = new DefaultKnownHostsServerKeyVerifier((clientSession, remoteAddress, serverKey) -> {
+                CLI.LOGGER.log(Level.WARNING, "Unknown host key for {0}", remoteAddress.toString());
+                return !strictHostKey;
             }, true);
 
             client.setServerKeyVerifier(verifier);

core/src/main/java/hudson/EnvVars.java

@@ -282,7 +282,7 @@ private void cutCycle(List<String> cycle) {
             }
 
             // if not, cut the reference to the first one.
-            cutCycleAt(cycle.get(0), cycle);
+            cutCycleAt(cycle.getFirst(), cycle);
         }
 
         /**