Migrate from EE 8 to EE 9 (#470)

basil · web-flow · commit bb9a5375a73d · 2025-02-06T17:05:28.000-08:00
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.87</version>
+    <version>5.6</version>
     <relativePath />
   </parent>
   <groupId>io.jenkins.plugins</groupId>
@@ -32,8 +32,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.440</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>
     <spotless.check.skip>false</spotless.check.skip>
     <hpi.compatibleSinceVersion>685</hpi.compatibleSinceVersion>
@@ -46,7 +46,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3289.v3ff9637cd241</version>
+        <version>3850.vb_c5319efa_e29</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
@@ -9,21 +9,22 @@
 import hudson.util.HttpResponses;
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.scm.api.SCMEvent;
 import org.apache.commons.lang.StringUtils;
 import org.gitlab4j.api.GitLabApiException;
 import org.gitlab4j.api.systemhooks.SystemHookManager;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 public final class GitLabSystemHookAction extends CrumbExclusion implements UnprotectedRootAction {
@@ -56,7 +57,7 @@ public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterC
         return false;
     }
 
-    public HttpResponse doPost(StaplerRequest request) throws GitLabApiException {
+    public HttpResponse doPost(StaplerRequest2 request) throws GitLabApiException {
         if (!request.getMethod().equals("POST")) {
             return HttpResponses.error(
                     HttpServletResponse.SC_BAD_REQUEST,
@@ -80,7 +81,7 @@ public HttpResponse doPost(StaplerRequest request) throws GitLabApiException {
         String origin = SCMEvent.originOf(request);
         SystemHookManager systemHookManager = new SystemHookManager();
         systemHookManager.addListener(new GitLabSystemHookListener(origin));
-        systemHookManager.handleEvent(request);
+        systemHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
         return HttpResponses.ok(); // TODO find a better response
     }
 
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
@@ -9,21 +9,22 @@
 import hudson.util.HttpResponses;
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
 import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.MessageDigest;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.scm.api.SCMEvent;
 import org.apache.commons.lang.StringUtils;
 import org.gitlab4j.api.GitLabApiException;
 import org.gitlab4j.api.webhook.WebHookManager;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
 public final class GitLabWebHookAction extends CrumbExclusion implements UnprotectedRootAction {
@@ -56,7 +57,7 @@ public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterC
         return false;
     }
 
-    public HttpResponse doPost(StaplerRequest request) throws IOException, GitLabApiException {
+    public HttpResponse doPost(StaplerRequest2 request) throws IOException, GitLabApiException {
         if (!request.getMethod().equals("POST")) {
             return HttpResponses.error(
                     HttpServletResponse.SC_BAD_REQUEST,
@@ -80,7 +81,7 @@ public HttpResponse doPost(StaplerRequest request) throws IOException, GitLabApi
         String origin = SCMEvent.originOf(request);
         WebHookManager webHookManager = new WebHookManager();
         webHookManager.addListener(new GitLabWebHookListener(origin));
-        webHookManager.handleEvent(request);
+        webHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
         return HttpResponses.ok(); // TODO find a better response
     }
 
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabAvatarCache.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabAvatarCache.java
@@ -16,6 +16,8 @@
 import hudson.util.HttpResponses;
 import hudson.util.NamingThreadFactory;
 import io.jenkins.plugins.gitlabbranchsource.GitLabSCMNavigator;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -43,14 +45,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.imageio.ImageIO;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.HttpResponse;
 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;
 
 /**
  * An avatar cache that will serve URLs that have been recently registered
@@ -260,7 +260,7 @@ public String getUrlName() {
      * @param size the requested size (defaults to {@code 48x48} if unspecified).
      * @return the response.
      */
-    public HttpResponse doDynamic(StaplerRequest req, @QueryParameter String size) {
+    public HttpResponse doDynamic(StaplerRequest2 req, @QueryParameter String size) {
         if (StringUtils.isBlank(req.getRestOfPath())) {
             return HttpResponses.notFound();
         }
@@ -303,7 +303,7 @@ public HttpResponse doDynamic(StaplerRequest req, @QueryParameter String size) {
         if (avatar.lastModified <= since) {
             return new HttpResponse() {
                 @Override
-                public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
+                public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
                         throws IOException, ServletException {
                     rsp.addDateHeader("Last-Modified", avatar.lastModified);
                     rsp.addHeader("Cache-control", "max-age=3600, public");
@@ -467,7 +467,7 @@ public ImageResponse(BufferedImage image, boolean flushImage, long lastModified,
         }
 
         @Override
-        public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
+        public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
                 throws IOException, ServletException {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             try {
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabBrowser.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabBrowser.java
@@ -17,7 +17,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class GitLabBrowser extends GitRepositoryBrowser {
 
@@ -89,7 +89,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public GitLabBrowser newInstance(StaplerRequest req, @NonNull JSONObject jsonObject) throws FormException {
+        public GitLabBrowser newInstance(StaplerRequest2 req, @NonNull JSONObject jsonObject) throws FormException {
             return req.bindJSON(GitLabBrowser.class, jsonObject);
         }
     }
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabIcons.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabIcons.java
@@ -44,7 +44,7 @@ public static String iconFileName(String name, Size size) {
         }
 
         JellyContext ctx = new JellyContext();
-        ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
+        ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);
         return icon.getQualifiedUrl(ctx);
     }
 
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabLink.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabLink.java
@@ -83,7 +83,7 @@ public String getIconFileName() {
         Icon icon = IconSet.icons.getIconByClassSpec(iconClassName + " icon-md");
         if (icon != null) {
             JellyContext ctx = new JellyContext();
-            ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
+            ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);
             return icon.getQualifiedUrl(ctx);
         }
         return null;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`import net.sf.json.JSONObject;`
`18`	`18`	`import org.jenkinsci.Symbol;`
`19`	`19`	`import org.kohsuke.stapler.DataBoundConstructor;`
`20`		`-import org.kohsuke.stapler.StaplerRequest;`
	`20`	`+import org.kohsuke.stapler.StaplerRequest2;`
`21`	`21`
`22`	`22`	`public class GitLabBrowser extends GitRepositoryBrowser {`
`23`	`23`
`@@ -89,7 +89,7 @@ public String getDisplayName() {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- public GitLabBrowser newInstance(StaplerRequest req, @NonNull JSONObject jsonObject) throws FormException {`
	`92`	`+ public GitLabBrowser newInstance(StaplerRequest2 req, @NonNull JSONObject jsonObject) throws FormException {`
`93`	`93`	`return req.bindJSON(GitLabBrowser.class, jsonObject);`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static String iconFileName(String name, Size size) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`JellyContext ctx = new JellyContext();`
`47`		`- ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);`
	`47`	`+ ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);`
`48`	`48`	`return icon.getQualifiedUrl(ctx);`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public String getIconFileName() {`
`83`	`83`	`Icon icon = IconSet.icons.getIconByClassSpec(iconClassName + " icon-md");`
`84`	`84`	`if (icon != null) {`
`85`	`85`	`JellyContext ctx = new JellyContext();`
`86`		`- ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);`
	`86`	`+ ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);`
`87`	`87`	`return icon.getQualifiedUrl(ctx);`
`88`	`88`	`}`
`89`	`89`	`return null;`