Require Java 17 or newer (#306)

jenkinsci · Oct 7, 2024 · 5154ff2 · 5154ff2
1 parent 4267329
commit 5154ff2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.1</version>
     <relativePath />
   </parent>
 
@@ -51,7 +51,7 @@
   <properties>
     <revision>1.28</revision>
     <changelist>-SNAPSHOT</changelist>
-    <jenkins.version>2.375.4</jenkins.version>
+    <jenkins.version>2.479</jenkins.version>
     <spotbugs.threshold>Low</spotbugs.threshold>
     <spotbugs.effort>Max</spotbugs.effort>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
@@ -62,8 +62,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.375.x</artifactId>
-        <version>2198.v39c76fc308ca</version>
+        <artifactId>bom-2.452.x</artifactId>
+        <version>3435.v238d66a_043fb_</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/main/java/hudson/plugins/timestamper/TimestamperConfig.java b/src/main/java/hudson/plugins/timestamper/TimestamperConfig.java
@@ -36,12 +36,12 @@
 import hudson.plugins.timestamper.format.TimestampFormat;
 import hudson.plugins.timestamper.pipeline.GlobalDecorator;
 import hudson.util.FormValidation;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Supplier;
-import javax.servlet.ServletException;
 import jenkins.YesNoMaybe;
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
@@ -116,8 +116,7 @@ public void setSystemTimeFormat(@CheckForNull String timestampFormat) {
     }
 
     @POST
-    public FormValidation doCheckSystemTimeFormat(@QueryParameter String systemTimeFormat)
-            throws IOException, ServletException {
+    public FormValidation doCheckSystemTimeFormat(@QueryParameter String systemTimeFormat) {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 
         if (Util.fixEmptyAndTrim(systemTimeFormat) == null) {

diff --git a/src/main/java/hudson/plugins/timestamper/action/TimestampsAction.java b/src/main/java/hudson/plugins/timestamper/action/TimestampsAction.java
@@ -31,8 +31,8 @@
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /**
  * Action which serves a page of time-stamps. The format of this page will not change, so it can be
@@ -78,7 +78,7 @@ public String getUrlName() {
 
     /** Serve a page at this URL. */
     @SuppressWarnings({"lgtm[jenkins/csrf]", "lgtm[jenkins/no-permission-check]"})
-    public void doIndex(StaplerRequest request, StaplerResponse response) throws IOException {
+    public void doIndex(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
         response.setContentType("text/plain;charset=UTF-8");
 
         PrintWriter writer = response.getWriter();

diff --git a/src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory3.java b/src/main/java/hudson/plugins/timestamper/annotator/TimestampAnnotatorFactory3.java
@@ -32,7 +32,7 @@
 import hudson.plugins.timestamper.format.TimestampFormatProvider;
 import jenkins.YesNoMaybe;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Provides the initial {@link TimestampAnnotator} for an annotated console output.
@@ -48,7 +48,7 @@ public final class TimestampAnnotatorFactory3 extends ConsoleAnnotatorFactory<Ru
         if (TimestampNote.useTimestampNotes(build.getClass())) {
             return null; // not using this system
         }
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         // JENKINS-16778: The request can be null when the slave goes off-line.
         if (request == null) {
             return null; // do not annotate
@@ -64,7 +64,7 @@ public final class TimestampAnnotatorFactory3 extends ConsoleAnnotatorFactory<Ru
      *
      * @return the offset in bytes
      */
-    private static long getOffset(StaplerRequest request) {
+    private static long getOffset(StaplerRequest2 request) {
         String path = request.getPathInfo();
         if (path == null) {
             // JENKINS-16438

diff --git a/src/main/java/hudson/plugins/timestamper/format/TimestampFormatProvider.java b/src/main/java/hudson/plugins/timestamper/format/TimestampFormatProvider.java
@@ -24,12 +24,12 @@
 package hudson.plugins.timestamper.format;
 
 import hudson.plugins.timestamper.TimestamperConfig;
+import jakarta.servlet.http.Cookie;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Supplier;
-import javax.servlet.http.Cookie;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Provides a {@link TimestampFormat} based on the current settings.
@@ -40,7 +40,7 @@ public class TimestampFormatProvider {
 
     private static Supplier<TimestampFormat> SUPPLIER = () -> {
         TimestamperConfig config = TimestamperConfig.get();
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         if (request == null) {
             return EmptyTimestampFormat.INSTANCE;
         }
@@ -58,7 +58,7 @@ public static TimestampFormat get() {
     }
 
     static TimestampFormat get(
-            String systemTimeFormat, String elapsedTimeFormat, StaplerRequest request, Locale locale) {
+            String systemTimeFormat, String elapsedTimeFormat, StaplerRequest2 request, Locale locale) {
 
         String mode = null;
         Boolean local = null;

diff --git a/src/main/java/hudson/plugins/timestamper/pipeline/TimestamperStep.java b/src/main/java/hudson/plugins/timestamper/pipeline/TimestamperStep.java
@@ -46,8 +46,8 @@
 import org.jenkinsci.plugins.workflow.steps.StepDescriptor;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
 /** Pipeline plug-in step for recording time-stamps. */
 public class TimestamperStep extends Step {
@@ -127,7 +127,7 @@ public String getHelpFile() {
         /** Serve the help file. */
         @Override
         @SuppressWarnings({"lgtm[jenkins/csrf]", "lgtm[jenkins/no-permission-check]"})
-        public void doHelp(StaplerRequest request, StaplerResponse response) throws IOException {
+        public void doHelp(StaplerRequest2 request, StaplerResponse2 response) throws IOException {
             response.setContentType("text/html;charset=UTF-8");
             PrintWriter writer = response.getWriter();
             writer.println(Messages.Description());

diff --git a/src/test/java/hudson/plugins/timestamper/format/TimestampFormatProviderTest.java b/src/test/java/hudson/plugins/timestamper/format/TimestampFormatProviderTest.java
@@ -28,19 +28,19 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import jakarta.servlet.http.Cookie;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import javax.servlet.http.Cookie;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Unit test for the {@link TimestampFormatProvider} class.
@@ -80,8 +80,8 @@ public static Collection<Object[]> data() {
         });
     }
 
-    private static StaplerRequest request(String... cookies) {
-        StaplerRequest request = mock(StaplerRequest.class);
+    private static StaplerRequest2 request(String... cookies) {
+        StaplerRequest2 request = mock(StaplerRequest2.class);
         Cookie[] requestCookies = null;
         if (cookies != null) {
             requestCookies = new Cookie[cookies.length];
@@ -91,7 +91,7 @@ private static StaplerRequest request(String... cookies) {
             }
         }
         when(request.getCookies()).thenReturn(requestCookies);
-        when(request.toString()).thenReturn(StaplerRequest.class.getSimpleName() + " " + Arrays.toString(cookies));
+        when(request.toString()).thenReturn(StaplerRequest2.class.getSimpleName() + " " + Arrays.toString(cookies));
         return request;
     }
 
@@ -112,7 +112,7 @@ private static EmptyTimestampFormat empty() {
     }
 
     @Parameter(0)
-    public StaplerRequest request;
+    public StaplerRequest2 request;
 
     @Parameter(1)
     public TimestampFormat expectedTimestampFormat;