Merge branch 'master' into JENKINS-73791

Author: Dohbedoh

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.9</version>
     <relativePath />
   </parent>
 
@@ -33,7 +33,9 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
-    <jenkins.version>2.440.3</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <useBeta>true</useBeta>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
@@ -42,8 +44,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.440.x</artifactId>
-        <version>3234.v5ca_5154341ef</version>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
+        <version>3893.v213a_42768d35</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/org/jenkinsci/plugins/github_branch_source/ApiRateLimitChecker.java

@@ -1,7 +1,6 @@
 package org.jenkinsci.plugins.github_branch_source;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Util;
 import hudson.model.TaskListener;
 import hudson.util.LogTaskListener;
@@ -18,7 +17,6 @@
 import org.kohsuke.github.GitHub;
 import org.kohsuke.github.RateLimitChecker;
 
-@SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") // https://github.com/spotbugs/spotbugs/issues/1539
 public enum ApiRateLimitChecker {
 
     /** Attempt to evenly distribute GitHub API requests. */

src/main/java/org/jenkinsci/plugins/github_branch_source/FillErrorResponse.java

@@ -1,13 +1,12 @@
 package org.jenkinsci.plugins.github_branch_source;
 
 import hudson.Util;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 // TODO replace with corresponding core functionality once Jenkins core has JENKINS-42443
 class FillErrorResponse extends IOException implements HttpResponse {
@@ -20,8 +19,7 @@ public FillErrorResponse(String message, boolean clearList) {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
-            throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException {
         rsp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         rsp.setContentType("text/html;charset=UTF-8");
         rsp.setHeader("X-Jenkins-Select-Error", clearList ? "clear" : "retain");

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubAppCredentials.java

@@ -82,7 +82,6 @@ public class GitHubAppCredentials extends BaseStandardCredentials implements Sta
 
     private String apiUri;
 
-    @SuppressFBWarnings(value = "IS2_INCONSISTENT_SYNC", justification = "#withOwner locking only for #byOwner")
     private String owner;
 
     private transient AppInstallationToken cachedToken;

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubConfiguration.java

@@ -42,7 +42,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 public class GitHubConfiguration extends GlobalConfiguration {
@@ -60,7 +60,7 @@ public GitHubConfiguration() {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         req.bindJSON(this, json);
         return true;
     }

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubOrgMetadataAction.java

@@ -76,7 +76,7 @@ public String getAvatarImageOf(String size) {
             String image = avatarIconClassNameImageOf(getAvatarIconClassName(), size);
             return image != null
                     ? image
-                    : (Stapler.getCurrentRequest().getContextPath()
+                    : (Stapler.getCurrentRequest2().getContextPath()
                             + Hudson.RESOURCE_PATH
                             + "/plugin/github-branch-source/images/"
                             + "/github-logo.svg");

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMBuilder.java

@@ -32,7 +32,6 @@
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.Item;
 import hudson.model.Queue;
 import hudson.plugins.git.GitSCM;
@@ -59,7 +58,6 @@
  *
  * @since 2.2.0
  */
-@SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE") // https://github.com/spotbugs/spotbugs/issues/1539
 public class GitHubSCMBuilder extends GitSCMBuilder<GitHubSCMBuilder> {
 
     private static final Random ENTROPY = new Random();

src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java

@@ -58,6 +58,7 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import hudson.util.LogTaskListener;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.Closeable;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -85,7 +86,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import jenkins.plugins.git.AbstractGitSCMSource;
 import jenkins.plugins.git.GitTagSCMRevision;

src/main/java/org/jenkinsci/plugins/github_branch_source/PullRequestSCMRevision.java

@@ -58,7 +58,7 @@ public PullRequestSCMRevision(
         this.mergeHash = mergeHash;
     }
 
-    @SuppressFBWarnings({"SE_PRIVATE_READ_RESOLVE_NOT_INHERITED", "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"})
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
     private Object readResolve() {
         if (getTarget() == null) {
             // fix an instance prior to the type migration, thankfully we have all the required info

src/test/java/org/jenkinsci/plugins/github_branch_source/EndpointTest.java

@@ -10,13 +10,13 @@
 import hudson.Util;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.csrf.CrumbExclusion;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Arrays;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.htmlunit.FailingHttpStatusCodeException;
 import org.htmlunit.HttpMethod;
@@ -31,8 +31,8 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.xml.sax.SAXException;
 
 public class EndpointTest {
@@ -103,7 +103,7 @@ private String appendCrumb(String url) {
     }
 
     private String getCrumb() {
-        return Functions.getCrumbRequestField() + "=" + Functions.getCrumb(null);
+        return Functions.getCrumbRequestField() + "=" + Functions.getCrumb((StaplerRequest2) null);
     }
 
     private Page post(String relative, String userName) throws Exception {
@@ -116,8 +116,8 @@ private Page post(String relative, String userName) throws Exception {
 
         final WebRequest request = new WebRequest(new URL(client.getContextPath() + relative), HttpMethod.POST);
         request.setAdditionalHeader("Accept", client.getBrowserVersion().getHtmlAcceptHeader());
-        request.setRequestParameters(
-                Arrays.asList(new NameValuePair(Functions.getCrumbRequestField(), Functions.getCrumb(null))));
+        request.setRequestParameters(Arrays.asList(
+                new NameValuePair(Functions.getCrumbRequestField(), Functions.getCrumb((StaplerRequest2) null))));
         return client.getPage(request);
     }
 
@@ -141,7 +141,7 @@ public String getUrlName() {
             return "testroot";
         }
 
-        public void doIndex(StaplerRequest request, StaplerResponse response) throws IOException {
+        public void doIndex(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
             visited = true;
             response.getWriter().println("OK");
         }

src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMBuilderTest.java

@@ -20,6 +20,7 @@
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.domains.Domain;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
+import hudson.model.Descriptor;
 import hudson.plugins.git.GitSCM;
 import hudson.plugins.git.Revision;
 import hudson.plugins.git.UserRemoteConfig;
@@ -82,7 +83,7 @@ public void createGitHubSCMSourceForTest(boolean configuredByUrl, String repoUrl
     }
 
     @Before
-    public void setUp() throws IOException {
+    public void setUp() throws IOException, Descriptor.FormException {
         owner = j.createProject(WorkflowMultiBranchProject.class);
         Credentials userPasswordCredential = new UsernamePasswordCredentialsImpl(
                 CredentialsScope.GLOBAL, "user-pass", null, "git-user", "git-secret");

src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigatorTest.java

@@ -37,6 +37,7 @@
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import hudson.model.Descriptor;
 import hudson.model.Item;
 import hudson.model.TaskListener;
 import hudson.model.User;
@@ -75,8 +76,16 @@ public class GitHubSCMNavigatorTest extends AbstractGitHubWireMockTest {
     @Mock
     private SCMSourceOwner scmSourceOwner;
 
-    private BaseStandardCredentials credentials = new UsernamePasswordCredentialsImpl(
-            CredentialsScope.GLOBAL, "authenticated-user", null, "git-user", "git-secret");
+    private BaseStandardCredentials credentials;
+
+    {
+        try {
+            credentials = new UsernamePasswordCredentialsImpl(
+                    CredentialsScope.GLOBAL, "authenticated-user", null, "git-user", "git-secret");
+        } catch (Descriptor.FormException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     private GitHubSCMNavigator navigator;