Merge pull request #359 from basil/jakarta

Migrate from EE 8 to EE 9
jenkinsci · Jan 23, 2025 · ff290cf · ff290cf
2 parents 5d7dc30 + b07fbb6
commit ff290cf
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.5</version>
         <relativePath />
     </parent>
 
@@ -59,8 +59,8 @@
         <revision>2.35</revision>
         <gitHubRepo>jenkinsci/pipeline-stage-view-plugin</gitHubRepo>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <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>
         <changelist>-SNAPSHOT</changelist>
         <node.version>18.7.0</node.version>
         <npm.version>8.15.0</npm.version>
@@ -100,7 +100,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>3208.vb_21177d4b_cd9</version>
+                <version>3850.vb_c5319efa_e29</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/endpoints/RunAPI.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/endpoints/RunAPI.java
@@ -44,7 +44,7 @@
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/rest/external/AtomFlowNodeExt.java b/rest-api/src/main/java/com/cloudbees/workflow/rest/external/AtomFlowNodeExt.java
@@ -69,7 +69,7 @@ public static AtomFlowNodeExt create(FlowNode node, String execNodeName, ExecDur
         AtomFlowNodeExt basic = new AtomFlowNodeExt();
         // It would be super awesome if we didn't need to make a throwaway object
         basic.addBasicNodeData(node, execNodeName, duration, startTimeMillis, status, error);
-        if (basic.getStatus() != StatusExt.NOT_EXECUTED && Stapler.getCurrentRequest() != null) {
+        if (basic.getStatus() != StatusExt.NOT_EXECUTED && Stapler.getCurrentRequest2() != null) {
             LogAction la = node.getAction(LogAction.class);
             if (la != null) {
                 basic.get_links().setLog(Link.newLink(Log.getUrl(node)));

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/util/JsonResponse.java b/rest-api/src/main/java/com/cloudbees/workflow/util/JsonResponse.java
@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 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;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 
 /**
@@ -23,7 +23,7 @@ public JsonResponse(ObjectMapper mapper, Object pojo) {
     }
 
     @Override
-    public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+    public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
         rsp.setContentType("application/json; charset=UTF-8");
         mapper.writeValue(rsp.getOutputStream(),pojo);
     }

diff --git a/rest-api/src/main/java/com/cloudbees/workflow/util/ModelUtil.java b/rest-api/src/main/java/com/cloudbees/workflow/util/ModelUtil.java
@@ -25,7 +25,7 @@
 
 import org.jenkinsci.plugins.workflow.graph.FlowNode;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import java.io.IOException;
 
@@ -54,7 +54,7 @@ public static String getFullItemUrl(String itemUrl) {
     }
 
     public static String getRootUrl() {
-        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        StaplerRequest2 currentRequest = Stapler.getCurrentRequest2();
         return (currentRequest != null) ? currentRequest.getContextPath() : "/";
     }
 }
diff --git a/rest-api/src/main/java/com/cloudbees/workflow/util/ServeJson.java b/rest-api/src/main/java/com/cloudbees/workflow/util/ServeJson.java
@@ -1,7 +1,7 @@
 package com.cloudbees.workflow.util;
 
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.Interceptor;
 import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
 
@@ -24,7 +24,7 @@
 public @interface ServeJson {
     public static class Processor extends Interceptor {
         @Override
-        public Object invoke(StaplerRequest request, StaplerResponse response, Object instance, Object[] arguments)
+        public Object invoke(StaplerRequest2 request, StaplerResponse2 response, Object instance, Object[] arguments)
                 throws IllegalAccessException, InvocationTargetException {
             try {
                 Object o = target.invoke(request, response, instance, arguments);

diff --git a/rest-api/src/test/java/com/cloudbees/workflow/Util.java b/rest-api/src/test/java/com/cloudbees/workflow/Util.java
@@ -28,6 +28,7 @@
 import org.htmlunit.Page;
 import hudson.model.Result;
 import hudson.util.RunList;
+import jakarta.servlet.ServletRequest;
 import jenkins.model.Jenkins;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
@@ -159,6 +160,6 @@ public static <T> T getJSON(String url, Class<T> to, JenkinsRule jenkinsRule) th
 
     private static Map.Entry<String, String> getCrumbHeaderNVP(Jenkins jenkins) {
         return new AbstractMap.SimpleEntry<>(jenkins.getCrumbIssuer().getDescriptor().getCrumbRequestField(),
-                        jenkins.getCrumbIssuer().getCrumb( null ));
+                        jenkins.getCrumbIssuer().getCrumb((ServletRequest) null));
     }
 }