Require Java 17 or newer; migrate to EE 9 (#223)

jenkinsci · Oct 8, 2024 · 582ed81 · 582ed81
1 parent 823905f
commit 582ed81
Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,4 @@
 buildPlugin(useContainerAgent: true, configurations: [
-  [ platform: 'linux', jdk: 11 ],
-  [ platform: 'windows', jdk: 11 ],
-  [ platform: 'linux', jdk: 17 ],
+  [platform: 'linux', jdk: 21],
+  [platform: 'windows', jdk: 17]
 ])
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.1</version>
     <relativePath />
   </parent>
 
@@ -16,7 +16,7 @@
   <properties>
     <revision>2</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.361.1</jenkins.version>
+    <jenkins.version>2.479</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <useBeta>true</useBeta> <!-- Jenkins.MANAGE -->
   </properties>
@@ -63,8 +63,8 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
-        <version>1836.vfe602c266c05</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/org/jenkinsci/plugins/displayurlapi/actions/AbstractDisplayAction.java b/src/main/java/org/jenkinsci/plugins/displayurlapi/actions/AbstractDisplayAction.java
@@ -5,10 +5,10 @@
 import java.util.Objects;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public abstract class AbstractDisplayAction implements Action {
@@ -30,15 +30,15 @@ public String getUrlName() {
         return URL_NAME;
     }
 
-    public final Object doRedirect(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public final Object doRedirect(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
         DisplayURLProvider provider = lookupProvider(req);
         rsp.sendRedirect(HttpServletResponse.SC_MOVED_TEMPORARILY, getRedirectURL(provider));
         return null;
     }
 
     protected abstract String getRedirectURL(DisplayURLProvider provider);
 
-    DisplayURLProvider lookupProvider(StaplerRequest req) {
+    DisplayURLProvider lookupProvider(StaplerRequest2 req) {
         final String providerName = req.getParameter("provider");
         if (StringUtils.isNotEmpty(providerName)) {
             ExtensionList<DisplayURLProvider> providers = DisplayURLProvider.all();

diff --git a/src/main/java/org/jenkinsci/plugins/displayurlapi/actions/RunDisplayAction.java b/src/main/java/org/jenkinsci/plugins/displayurlapi/actions/RunDisplayAction.java
@@ -8,7 +8,7 @@
 import jenkins.model.TransientActionFactory;
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import java.util.Collection;
 import org.kohsuke.stapler.export.Exported;
@@ -45,7 +45,7 @@ public String getDisplayUrl() {
 
     @Override
     protected String getRedirectURL(DisplayURLProvider provider) {
-        StaplerRequest req = Stapler.getCurrentRequest();
+        StaplerRequest2 req = Stapler.getCurrentRequest2();
         String page = req.getParameter("page");
         String url;
         if (page != null) {

diff --git a/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectClassicTest.java b/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectClassicTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.net.HttpURLConnection;
 import java.net.URL;

diff --git a/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectExtendedTest.java b/src/test/java/org/jenkinsci/plugins/displayurlapi/actions/ActionRedirectExtendedTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.TestExtension;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import static io.restassured.RestAssured.given;
 import static org.junit.Assert.assertEquals;