Migrate from EE 8 to EE 9

Author: basil

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.74</version>
+    <version>5.6</version>
   </parent>
 
   <artifactId>generic-webhook-trigger</artifactId>
@@ -56,10 +56,8 @@
 
   <properties>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.414</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
-    <findbugs.failOnError>false</findbugs.failOnError>
-    <maven.javadoc.skip>true</maven.javadoc.skip>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <violations.version>2.2.0</violations.version>
     <changelog>2.2.2</changelog>
     <spotless.check.skip>false</spotless.check.skip>
@@ -70,7 +68,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>2982.vdce2153031a_0</version>
+        <version>3850.vb_c5319efa_e29</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java

@@ -15,6 +15,11 @@
 import hudson.model.UnprotectedRootAction;
 import hudson.security.csrf.CrumbExclusion;
 import hudson.util.HttpResponses;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -23,17 +28,12 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.jenkinsci.plugins.gwt.jobfinder.JobFinder;
 import org.jenkinsci.plugins.gwt.whitelist.WhitelistException;
 import org.jenkinsci.plugins.gwt.whitelist.WhitelistVerifier;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 public class GenericWebHookRequestReceiver extends CrumbExclusion implements UnprotectedRootAction {
@@ -59,7 +59,7 @@ public class GenericWebHookRequestReceiver extends CrumbExclusion implements Unp
     private static final String URL_NAME = "generic-webhook-trigger";
     private static final Logger LOGGER = Logger.getLogger(GenericWebHookRequestReceiver.class.getName());
 
-    public HttpResponse doInvoke(final StaplerRequest request) {
+    public HttpResponse doInvoke(final StaplerRequest2 request) {
         if (request.getMethod().equals("OPTIONS")) {
             LOGGER.log(INFO, "Ignoring OPTIONS");
             return HttpResponses.ok();
@@ -96,7 +96,7 @@ public HttpResponse doInvoke(final StaplerRequest request) {
         return this.doInvoke(headers, parameterMap, postContent, givenToken);
     }
 
-    private String getPostContentAsJson(final StaplerRequest request) throws IOException {
+    private String getPostContentAsJson(final StaplerRequest2 request) throws IOException {
         final String contentType = request.getContentType();
         if (contentType != null && contentType.contains(FORM_URLENCODED)) {
             final Map<String, String[]> data = new HashMap<>(request.getParameterMap());
@@ -152,7 +152,7 @@ int getGivenQuietPeriod(final Map<String, List<String>> headers, final Map<Strin
     }
 
     @VisibleForTesting
-    Map<String, List<String>> getHeaders(final StaplerRequest request) {
+    Map<String, List<String>> getHeaders(final StaplerRequest2 request) {
         final Map<String, List<String>> headers = new HashMap<>();
         final Enumeration<String> headersEnumeration = request.getHeaderNames();
         while (headersEnumeration.hasMoreElements()) {

src/main/java/org/jenkinsci/plugins/gwt/global/Whitelist.java

@@ -8,7 +8,7 @@
 import jenkins.model.GlobalConfiguration;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 public class Whitelist extends GlobalConfiguration implements Serializable {
@@ -33,7 +33,7 @@ public Whitelist() {
     }
 
     @Override
-    public boolean configure(final StaplerRequest req, final JSONObject json) throws FormException {
+    public boolean configure(final StaplerRequest2 req, final JSONObject json) throws FormException {
         req.bindJSON(this, json);
         save();
         return true;

src/test/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiverTest.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class GenericWebHookRequestReceiverTest {
 
@@ -134,7 +134,7 @@ public void testThatHeaderAuthorizationBearerTokenGivesThatToken() {
     public void testThatHeadersCanBeTransformedToList() {
         final GenericWebHookRequestReceiver sut = new GenericWebHookRequestReceiver();
 
-        final StaplerRequest request = mock(StaplerRequest.class);
+        final StaplerRequest2 request = mock(StaplerRequest2.class);
         when(request.getHeaderNames()) //
                 .thenReturn( //
                         new ArrayEnumeration(new String[] {"headerName1"}));
@@ -155,7 +155,7 @@ public void testThatHeadersCanBeTransformedToList() {
     public void testThatHeadersCanBeTransformedToListSeveralValues() {
         final GenericWebHookRequestReceiver sut = new GenericWebHookRequestReceiver();
 
-        final StaplerRequest request = mock(StaplerRequest.class);
+        final StaplerRequest2 request = mock(StaplerRequest2.class);
         when(request.getHeaderNames()) //
                 .thenReturn( //
                         new ArrayEnumeration(new String[] {"headerName1"}));
@@ -176,7 +176,7 @@ public void testThatHeadersCanBeTransformedToListSeveralValues() {
     public void testThatHeadersCanBeTransformedToListSeveralNames() {
         final GenericWebHookRequestReceiver sut = new GenericWebHookRequestReceiver();
 
-        final StaplerRequest request = mock(StaplerRequest.class);
+        final StaplerRequest2 request = mock(StaplerRequest2.class);
         when(request.getHeaderNames()) //
                 .thenReturn( //
                         new ArrayEnumeration(new String[] {"headerName1", "headerName2"}));