Merge pull request #245 from basil/jakarta

Migrate from EE 8 to EE 9

Author: res0nance

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>4.86</version>
+		<version>5.7</version>
 		<relativePath />
 	</parent>
 
@@ -16,7 +16,9 @@
 	<properties>
 		<changelist>999999-SNAPSHOT</changelist>
 		<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-		<jenkins.version>2.426.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>
 	</properties>
 
 	<name>Parameterized Scheduler</name>
@@ -90,8 +92,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
-				<artifactId>bom-2.426.x</artifactId>
-				<version>3208.vb_21177d4b_cd9</version>
+				<artifactId>bom-${jenkins.baseline}.x</artifactId>
+				<version>3850.vb_c5319efa_e29</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>

src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedStaplerRequest.java

@@ -1,28 +1,28 @@
 package org.jenkinsci.plugins.parameterizedscheduler;
 
 import net.sf.json.JSONObject;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.BindInterceptor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.bind.BoundObjectTable;
 import org.kohsuke.stapler.lang.Klass;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 import java.io.BufferedReader;
 import java.lang.reflect.Type;
 import java.security.Principal;
@@ -34,7 +34,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-public class ParameterizedStaplerRequest implements StaplerRequest {
+public class ParameterizedStaplerRequest implements StaplerRequest2 {
 
 	private final String value;
 
@@ -481,22 +481,22 @@ public String getOriginalRequestURI() {
 	}
 
 	@Override
-	public boolean checkIfModified(long timestampOfResource, StaplerResponse rsp) {
+	public boolean checkIfModified(long timestampOfResource, StaplerResponse2 rsp) {
 		return false;
 	}
 
 	@Override
-	public boolean checkIfModified(Date timestampOfResource, StaplerResponse rsp) {
+	public boolean checkIfModified(Date timestampOfResource, StaplerResponse2 rsp) {
 		return false;
 	}
 
 	@Override
-	public boolean checkIfModified(Calendar timestampOfResource, StaplerResponse rsp) {
+	public boolean checkIfModified(Calendar timestampOfResource, StaplerResponse2 rsp) {
 		return false;
 	}
 
 	@Override
-	public boolean checkIfModified(long timestampOfResource, StaplerResponse rsp, long expiration) {
+	public boolean checkIfModified(long timestampOfResource, StaplerResponse2 rsp, long expiration) {
 		return false;
 	}
 
@@ -561,7 +561,12 @@ public JSONObject getSubmittedForm() {
 	}
 
 	@Override
-	public FileItem getFileItem(String name) {
+	public FileItem getFileItem2(String name) {
+		return null;
+	}
+
+	@Override
+	public org.apache.commons.fileupload.FileItem getFileItem(String name) {
 		return null;
 	}
 
@@ -580,6 +585,11 @@ public String createJavaScriptProxy(Object toBeExported) {
 		return null;
 	}
 
+	@Override
+	public RenderOnDemandParameters createJavaScriptProxyParameters(Object toBeExported) {
+		return null;
+	}
+
 	@Override
 	public BindInterceptor setBindInterceptpr(BindInterceptor bindListener) {
 		return null;

src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedSchedulerTest.java

@@ -18,7 +18,7 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -149,13 +149,13 @@ public NullParameterDefinition(@NonNull String name) {
 
         @CheckForNull
         @Override
-        public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject jsonObject) {
+        public ParameterValue createValue(StaplerRequest2 staplerRequest, JSONObject jsonObject) {
             return null;
         }
 
         @CheckForNull
         @Override
-        public ParameterValue createValue(StaplerRequest staplerRequest) {
+        public ParameterValue createValue(StaplerRequest2 staplerRequest) {
             return null;
         }
     }