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.7</version>
         <relativePath />
     </parent>
 
@@ -25,7 +25,7 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.414</jenkins.baseline>
+        <jenkins.baseline>2.479</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>2278.v47b_4508e256a</version>
+                <version>3850.vb_c5319efa_e29</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -81,7 +81,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>job-dsl</artifactId>
-            <version>1.82</version>
             <optional>true</optional>
         </dependency>
 

src/main/java/com/cloudbees/jenkins/plugins/BitBucketMultibranchTrigger.java

@@ -11,7 +11,7 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.logging.Logger;
 

src/main/java/com/cloudbees/jenkins/plugins/BitBucketTrigger.java

@@ -19,7 +19,7 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;

src/main/java/com/cloudbees/jenkins/plugins/BitbucketCrumbExclusion.java

@@ -3,10 +3,10 @@
 import hudson.Extension;
 import hudson.security.csrf.CrumbExclusion;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 @Extension

src/main/java/com/cloudbees/jenkins/plugins/BitbucketHookReceiver.java

@@ -11,7 +11,7 @@
 import net.sf.json.JSONObject;
 
 import org.apache.commons.io.IOUtils;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
@@ -39,7 +39,7 @@ public String getUrlName() {
      * as form-urlencoded <pre>payload=JSON</pre>
      * @throws IOException
      */
-    public void doIndex(StaplerRequest req) throws IOException {
+    public void doIndex(StaplerRequest2 req) throws IOException {
         String body = IOUtils.toString(req.getInputStream());
         if (!body.isEmpty() && req.getRequestURI().contains("/" + BITBUCKET_HOOK_URL + "/")) {
             String contentType = req.getContentType();

src/main/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessor.java

@@ -5,7 +5,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;

src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java

@@ -7,7 +7,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;