diff --git a/pom.xml b/pom.xml index ee4ab3f2..9875f667 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 3893.v213a_42768d35 + 4051.v78dce3ce8b_d6 pom import diff --git a/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java b/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java index a34416ef..e30a28a2 100644 --- a/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java +++ b/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java @@ -39,7 +39,7 @@ import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * When a build fails it creates jira issues. @@ -520,7 +520,7 @@ public ListBoxModel doFillTypeIdItems(@AncestorInPath final Item item) { } @Override - public JiraCreateIssueNotifier newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public JiraCreateIssueNotifier newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraCreateIssueNotifier.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/JiraIssueMigrator.java b/src/main/java/hudson/plugins/jira/JiraIssueMigrator.java index 0a55f971..ebd49d82 100644 --- a/src/main/java/hudson/plugins/jira/JiraIssueMigrator.java +++ b/src/main/java/hudson/plugins/jira/JiraIssueMigrator.java @@ -12,7 +12,7 @@ import hudson.tasks.Publisher; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; public class JiraIssueMigrator extends Notifier { @@ -146,7 +146,7 @@ public DescriptorImpl() { } @Override - public JiraIssueMigrator newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public JiraIssueMigrator newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraIssueMigrator.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/JiraMailAddressResolver.java b/src/main/java/hudson/plugins/jira/JiraMailAddressResolver.java index 5e3b93a2..e25f5d9c 100644 --- a/src/main/java/hudson/plugins/jira/JiraMailAddressResolver.java +++ b/src/main/java/hudson/plugins/jira/JiraMailAddressResolver.java @@ -8,7 +8,7 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * Resolve user email by searching his userId as username in Jira. @@ -35,7 +35,7 @@ public String findMailAddressFor(User u) { Job job = null; - StaplerRequest req = Stapler.getCurrentRequest(); + StaplerRequest2 req = Stapler.getCurrentRequest2(); if (req != null) { job = req.findAncestorObject(Job.class); } diff --git a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java index eb2bef6b..32c26e6e 100644 --- a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java +++ b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdater.java @@ -11,7 +11,7 @@ import hudson.tasks.Publisher; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * Task which releases the jira version specified in the parameters when the build completes. @@ -91,7 +91,7 @@ public DescriptorImpl() { } @Override - public JiraReleaseVersionUpdater newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public JiraReleaseVersionUpdater newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraReleaseVersionUpdater.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java index 3b85be11..057c0d82 100644 --- a/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java +++ b/src/main/java/hudson/plugins/jira/JiraReleaseVersionUpdaterBuilder.java @@ -12,7 +12,7 @@ import jenkins.tasks.SimpleBuildStep; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * Created by Reda on 18/12/2014. @@ -96,7 +96,7 @@ public String getHelpFile() { } @Override - public JiraReleaseVersionUpdaterBuilder newInstance(StaplerRequest req, JSONObject formData) + public JiraReleaseVersionUpdaterBuilder newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraReleaseVersionUpdaterBuilder.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index 236e950a..555dfbac 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -46,6 +46,7 @@ import hudson.util.FormValidation; import hudson.util.ListBoxModel; import hudson.util.Secret; +import jakarta.servlet.ServletException; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -76,7 +77,6 @@ import java.util.logging.Logger; import java.util.regex.Pattern; import javax.annotation.PreDestroy; -import javax.servlet.ServletException; import jenkins.model.Jenkins; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; diff --git a/src/main/java/hudson/plugins/jira/JiraVersionCreator.java b/src/main/java/hudson/plugins/jira/JiraVersionCreator.java index d4f9aa88..a60cdf86 100644 --- a/src/main/java/hudson/plugins/jira/JiraVersionCreator.java +++ b/src/main/java/hudson/plugins/jira/JiraVersionCreator.java @@ -11,7 +11,7 @@ import hudson.tasks.Publisher; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * A build step which creates new Jira version @@ -77,7 +77,7 @@ public boolean isApplicable(Class jobType) { } @Override - public JiraVersionCreator newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public JiraVersionCreator newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraVersionCreator.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/JiraVersionCreatorBuilder.java b/src/main/java/hudson/plugins/jira/JiraVersionCreatorBuilder.java index 37b5424d..31f491b6 100644 --- a/src/main/java/hudson/plugins/jira/JiraVersionCreatorBuilder.java +++ b/src/main/java/hudson/plugins/jira/JiraVersionCreatorBuilder.java @@ -12,7 +12,7 @@ import jenkins.tasks.SimpleBuildStep; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; /** * A build step which creates new Jira version. It has the same functionality as @@ -78,7 +78,7 @@ public boolean isApplicable(Class jobType) { } @Override - public JiraVersionCreatorBuilder newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public JiraVersionCreatorBuilder newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { return req.bindJSON(JiraVersionCreatorBuilder.class, formData); } diff --git a/src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java b/src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java index dc5409f7..9251e2f6 100644 --- a/src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java +++ b/src/main/java/hudson/plugins/jira/listissuesparameter/JiraIssueParameterDefinition.java @@ -35,7 +35,7 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; public class JiraIssueParameterDefinition extends ParameterDefinition { private static final long serialVersionUID = 3927562542249244416L; @@ -50,7 +50,7 @@ public JiraIssueParameterDefinition(String name, String description, String jira } @Override - public ParameterValue createValue(StaplerRequest req) { + public ParameterValue createValue(StaplerRequest2 req) { String[] values = req.getParameterValues(getName()); if (values == null || values.length != 1) { return null; @@ -60,7 +60,7 @@ public ParameterValue createValue(StaplerRequest req) { } @Override - public ParameterValue createValue(StaplerRequest req, JSONObject formData) { + public ParameterValue createValue(StaplerRequest2 req, JSONObject formData) { JiraIssueParameterValue value = req.bindJSON(JiraIssueParameterValue.class, formData); return value; } @@ -71,7 +71,7 @@ public ParameterValue createValue(CLICommand command, String value) throws IOExc } public List getIssues() throws IOException, TimeoutException { - Job job = Stapler.getCurrentRequest().findAncestorObject(Job.class); + Job job = Stapler.getCurrentRequest2().findAncestorObject(Job.class); JiraSite site = JiraSite.get(job); if (site == null) { diff --git a/src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java b/src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java index b0f273b8..9cd41e53 100644 --- a/src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java +++ b/src/main/java/hudson/plugins/jira/pipeline/IssueFieldUpdateStep.java @@ -19,12 +19,12 @@ import hudson.tasks.BuildStepDescriptor; import hudson.tasks.Builder; import hudson.util.FormValidation; +import jakarta.servlet.ServletException; import java.io.IOException; import java.io.PrintStream; import java.util.Collections; import java.util.List; import java.util.Set; -import javax.servlet.ServletException; import jenkins.tasks.SimpleBuildStep; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; diff --git a/src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java b/src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java index 2a4e0c26..b998ecd9 100644 --- a/src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java +++ b/src/main/java/hudson/plugins/jira/versionparameter/JiraVersionParameterDefinition.java @@ -15,7 +15,7 @@ import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.Stapler; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; public class JiraVersionParameterDefinition extends ParameterDefinition { private static final long serialVersionUID = 4232979892748310160L; @@ -41,7 +41,7 @@ public JiraVersionParameterDefinition( } @Override - public ParameterValue createValue(StaplerRequest req) { + public ParameterValue createValue(StaplerRequest2 req) { String[] values = req.getParameterValues(getName()); if (values == null || values.length != 1) { return null; @@ -50,7 +50,7 @@ public ParameterValue createValue(StaplerRequest req) { } @Override - public ParameterValue createValue(StaplerRequest req, JSONObject formData) { + public ParameterValue createValue(StaplerRequest2 req, JSONObject formData) { JiraVersionParameterValue value = req.bindJSON(JiraVersionParameterValue.class, formData); return value; } @@ -61,7 +61,7 @@ public ParameterValue createValue(CLICommand command, String value) throws IOExc } public List getVersions() throws IOException { - Job contextJob = Stapler.getCurrentRequest().findAncestorObject(Job.class); + Job contextJob = Stapler.getCurrentRequest2().findAncestorObject(Job.class); JiraSite site = JiraSite.get(contextJob); if (site == null) {