Merge pull request #388 from basil/jakarta

Migrate from EE 8 to EE 9
jenkinsci · Feb 4, 2025 · 35014e4 · 35014e4
2 parents 457ad8d + a2dd2fa
commit 35014e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 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.6</version>
     <relativePath />
   </parent>
 
@@ -45,8 +45,8 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <!-- 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>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
@@ -56,7 +56,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3435.v238d66a_043fb_</version>
+        <version>3850.vb_c5319efa_e29</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/main/java/hudson/plugins/view/dashboard/Dashboard.java b/src/main/java/hudson/plugins/view/dashboard/Dashboard.java
@@ -10,19 +10,19 @@
 import hudson.model.ListView;
 import hudson.model.TopLevelItem;
 import hudson.model.ViewDescriptor;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.security.stapler.StaplerDispatchable;
 import net.sf.json.JSONObject;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * View that can be customized with portlets to show the selected jobs information in various ways.
@@ -197,7 +197,7 @@ public synchronized List<Job> getJobs() {
     }
 
     @Override
-    protected synchronized void submit(StaplerRequest req) throws IOException, ServletException, FormException {
+    protected synchronized void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
         super.submit(req);
 
         try {

diff --git a/src/main/java/hudson/plugins/view/dashboard/DashboardPortlet.java b/src/main/java/hudson/plugins/view/dashboard/DashboardPortlet.java
@@ -9,7 +9,7 @@
 import java.util.Comparator;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Report that can summarize project data across multiple projects and display the resulting data.
@@ -34,7 +34,7 @@ public String getName() {
 
     public Dashboard getDashboard() {
         // TODO Can the dashboard instance be a field on this class -- parent?
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         return req != null ? req.findAncestorObject(Dashboard.class) : null;
     }