Merge pull request #94 from jenkinsci/migrate-EE9

Require Jenkins 2.479.1

Author: mawinter69

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.87</version>
+    <version>5.6</version>
     <relativePath/>
   </parent>
 
@@ -35,8 +35,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/pipeline-agent-build-history-plugin</gitHubRepo>
   </properties>
 
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3358.vea_fa_1f41504d</version>
+        <version>4051.v78dce3ce8b_d6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -81,7 +81,8 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>access-modifier-suppressions</artifactId>
-      <version>1.33</version>
+      <version>${access-modifier-checker.version}</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 

src/main/java/io/jenkins/plugins/agent_build_history/AgentBuildHistory.java

@@ -21,9 +21,9 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +44,7 @@ public AgentBuildHistory(Computer computer) {
     LOGGER.log(Level.CONFIG, () -> "Creating AgentBuildHistory for " + computer.getName());
   }
 
-  public static String getCookieValue(StaplerRequest req, String name, String defaultValue) {
+  public static String getCookieValue(StaplerRequest2 req, String name, String defaultValue) {
     Cookie[] cookies = req.getCookies();
     if (cookies != null) {
       for (Cookie cookie : cookies) {
@@ -86,7 +86,7 @@ public RunListTable getHandler() {
     }
     RunListTable runListTable = new RunListTable(computer.getName());
     //Get Parameters from URL
-    StaplerRequest req = Stapler.getCurrentRequest();
+    StaplerRequest2 req = Stapler.getCurrentRequest2();
     int page = req.getParameter("page") != null ? Integer.parseInt(req.getParameter("page")) : 1;
     int pageSize = req.getParameter("pageSize") != null ? Integer.parseInt(req.getParameter("pageSize")) : Integer.parseInt(getCookieValue(req, "pageSize", "20"));
     String sortColumn = req.getParameter("sortColumn") != null ? req.getParameter("sortColumn") : getCookieValue(req, "sortColumn", "startTime");

src/main/java/io/jenkins/plugins/agent_build_history/AgentExecution.java

@@ -5,8 +5,8 @@
 import hudson.Util;
 import hudson.model.Run;
 import java.io.IOException;
+import java.time.Instant;
 import java.util.Collections;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Objects;
 import java.util.Set;
@@ -207,7 +207,7 @@ public Status getFlowNodeStatus() {
     }
 
     public String getStartTimeString() {
-      return Util.XS_DATETIME_FORMATTER.format(new Date(startTime));
+      return Util.XS_DATETIME_FORMATTER2.format(Instant.ofEpochMilli(startTime));
     }
 
     public String getStartTimeSince() {