Migrate from EE 8 to EE 9

Author: basil

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.8</version>
     <relativePath />
   </parent>
 
@@ -34,15 +34,15 @@
   <scm>
     <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
     <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
-    <tag>electricflow-1.1.39</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/${gitHubRepo}</url>
   </scm>
 
   <properties>
     <revision>1.1.40</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.baseline>2.426</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- TODO fix existing violations -->
     <spotbugs.threshold>High</spotbugs.threshold>
@@ -54,7 +54,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3208.vb_21177d4b_cd9</version>
+        <version>3944.v1a_e4f8b_452db_</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/org/jenkinsci/plugins/electricflow/ElectricFlowGlobalConfiguration.java

@@ -14,7 +14,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 @Symbol("electricflow")
@@ -36,7 +36,7 @@ public ElectricFlowGlobalConfiguration() {
     // ~ Methods ----------------------------------------------------------------
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
         this.configurations = null;
         req.bindJSON(this, formData);
         save();

src/main/java/org/jenkinsci/plugins/electricflow/ElectricFlowPipelinePublisher.java

@@ -36,6 +36,7 @@
 import hudson.tasks.Recorder;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -44,7 +45,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import javax.servlet.ServletException;
 import jenkins.tasks.SimpleBuildStep;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -68,8 +68,8 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 public class ElectricFlowPipelinePublisher extends Recorder implements SimpleBuildStep {
 
@@ -871,7 +871,7 @@ public ListBoxModel doFillProjectNameItems(
         }
 
         @Override
-        public void doHelp(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doHelp(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
             super.doHelp(req, rsp);
         }
 

src/main/java/org/jenkinsci/plugins/electricflow/rest/ElectricFlowEFRunAPIAction.java

@@ -11,20 +11,20 @@
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Queue;
 import hudson.model.StringParameterValue;
+import jakarta.servlet.ServletException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.electricflow.causes.EFCause;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.verb.GET;
 import org.kohsuke.stapler.verb.POST;
 
@@ -63,15 +63,15 @@ public String getUrlName() {
     // action methods
     @GET
     @POST
-    public void doIndex(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+    public void doIndex(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
         rsp.setStatus(201);
         JSONObject jsonObject = this.getEFRunIndexResponse();
         this.sendJSONResponse(rsp, jsonObject);
     }
 
     @POST
     @GET
-    public void doBuild(StaplerRequest req, StaplerResponse rsp
+    public void doBuild(StaplerRequest2 req, StaplerResponse2 rsp
             // @QueryParameter final JSONObject json
             // @QueryParameter("value") final String value,
             // JSONObject formData
@@ -237,11 +237,12 @@ private List<ParameterDefinition> getParameterDefinitions() {
         return new ArrayList<ParameterDefinition>();
     }
 
-    private void sendJSONResponse(StaplerResponse rsp, JSONObject responseObject) throws IOException, ServletException {
+    private void sendJSONResponse(StaplerResponse2 rsp, JSONObject responseObject)
+            throws IOException, ServletException {
         this.sendJSONResponse(201, rsp, responseObject);
     }
 
-    private void sendJSONResponse(int responseCode, StaplerResponse rsp, JSONObject responseObject)
+    private void sendJSONResponse(int responseCode, StaplerResponse2 rsp, JSONObject responseObject)
             throws IOException, ServletException {
         rsp.setStatus(responseCode);
         String responseString = responseObject.toString();