Migrate from EE 8 to EE 9 (#94)

jenkinsci · Jan 24, 2025 · 3505927 · 3505927
1 parent 9fc4fed
commit 3505927
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.86</version>
+    <version>5.5</version>
     <relativePath/>
   </parent>
 
@@ -25,7 +25,9 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/external-monitor-job-plugin</gitHubRepo>
-    <jenkins.version>2.361.4</jenkins.version>
+    <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
   </properties>
 
   <dependencies>

diff --git a/src/main/java/hudson/model/ExternalJob.java b/src/main/java/hudson/model/ExternalJob.java
@@ -28,12 +28,12 @@
 import hudson.util.AlternativeUiTextProvider;
 import java.io.File;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 import jenkins.model.Jenkins;
 import org.jenkinsci.plugins.externalmonitorjob.Messages;
-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.POST;
 
 /**
@@ -81,7 +81,7 @@ public synchronized ExternalRun newBuild() throws IOException {
     /**
      * Used to check if this is an external job and ready to accept a build result.
      */
-    public void doAcceptBuildResult(StaplerResponse rsp) throws IOException, ServletException {
+    public void doAcceptBuildResult(StaplerResponse2 rsp) throws IOException, ServletException {
         checkPermission(AbstractProject.BUILD);
         rsp.setStatus(HttpServletResponse.SC_OK);
     }
@@ -92,7 +92,7 @@ public void doAcceptBuildResult(StaplerResponse rsp) throws IOException, Servlet
      * @param rsp   Remote response
      */
     @POST
-    public void doPostBuildResult( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
+    public void doPostBuildResult( StaplerRequest2 req, StaplerResponse2 rsp ) throws IOException, ServletException {
         ExternalRun run = newBuild();
         run.acceptRemoteSubmission(req.getReader());
         rsp.setStatus(HttpServletResponse.SC_OK);