Migrate from EE 8 to EE 9 (#120)

jenkinsci · Jan 22, 2025 · 4ded3dc · 4ded3dc
1 parent 847ad34
commit 4ded3dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.86</version>
+    <version>5.5</version>
     <relativePath />
   </parent>
 
@@ -35,7 +35,9 @@
   <properties>
     <revision>2.45</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.401.3</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>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>

diff --git a/src/test/java/org/glassfish/jersey/JerseyResource.java b/src/test/java/org/glassfish/jersey/JerseyResource.java
@@ -1,13 +1,13 @@
 package org.glassfish.jersey;
 
 import hudson.model.UnprotectedRootAction;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.net.URL;
-import javax.servlet.ServletException;
 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;
 
 public class JerseyResource implements UnprotectedRootAction {
 
@@ -38,7 +38,7 @@ public HttpResponse doEmployee(@QueryParameter String q) {
         }
         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.setContentType(contentType + ";charset=UTF-8");
                 rsp.serveFile(req, url, 0);