From e2b91cd60b586b1221748ba1ec19636dfb8f39a8 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 22 Jan 2025 11:31:58 -0800
Subject: [PATCH 1/2] Migrate from EE 8 to EE 9

---
 .../java/hudson/plugins/jira/JiraCreateIssueNotifier.java | 4 ++--
 src/main/java/hudson/plugins/jira/JiraIssueMigrator.java  | 4 ++--
 .../java/hudson/plugins/jira/JiraMailAddressResolver.java | 4 ++--
 .../hudson/plugins/jira/JiraReleaseVersionUpdater.java    | 4 ++--
 .../plugins/jira/JiraReleaseVersionUpdaterBuilder.java    | 4 ++--
 src/main/java/hudson/plugins/jira/JiraSite.java           | 2 +-
 src/main/java/hudson/plugins/jira/JiraVersionCreator.java | 4 ++--
 .../hudson/plugins/jira/JiraVersionCreatorBuilder.java    | 4 ++--
 .../listissuesparameter/JiraIssueParameterDefinition.java | 8 ++++----
 .../plugins/jira/pipeline/IssueFieldUpdateStep.java       | 2 +-
 .../versionparameter/JiraVersionParameterDefinition.java  | 8 ++++----
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java b/src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java
index a34416ef4..e30a28a2c 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 0a55f9717..ebd49d824 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 5e3b93a22..e25f5d9c9 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 eb2bef6b4..32c26e6ea 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 3b85be11f..057c0d82d 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 236e950a2..555dfbac4 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 d4f9aa884..a60cdf867 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<? extends AbstractProject> 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 37b5424d6..31f491b6e 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<? extends AbstractProject> 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 dc5409f71..9251e2f62 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<JiraIssueParameterDefinition.Result> 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 b0f273b82..9cd41e538 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 2a4e0c269..b998ecd9e 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<JiraVersionParameterDefinition.Result> 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) {

From 8eaa0d632d9674901f89fdcec6ffc1e9ae2e1087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 22:56:56 +0000
Subject: [PATCH 2/2] Bump the jenkins group with 2 updates

Bumps the jenkins group with 2 updates: [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) and [io.jenkins.tools.bom:bom-2.479.x](https://github.com/jenkinsci/bom).


Updates `org.jenkins-ci.plugins:plugin` from 5.5 to 5.6
- [Release notes](https://github.com/jenkinsci/plugin-pom/releases)
- [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-5.5...plugin-5.6)

Updates `io.jenkins.tools.bom:bom-2.479.x` from 3893.v213a_42768d35 to 4051.v78dce3ce8b_d6
- [Release notes](https://github.com/jenkinsci/bom/releases)
- [Commits](https://github.com/jenkinsci/bom/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: jenkins
- dependency-name: io.jenkins.tools.bom:bom-2.479.x
  dependency-type: direct:production
  dependency-group: jenkins
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 208208c20..414003bfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.5</version>
+    <version>5.6</version>
     <relativePath />
   </parent>
 
@@ -63,7 +63,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3893.v213a_42768d35</version>
+        <version>4051.v78dce3ce8b_d6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>