Migrate from EE 8 to EE 9 (#251)

Author: basil

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.7</version>
         <relativePath />
     </parent>
 
@@ -28,8 +28,8 @@
         <revision>1.49</revision>
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-        <jenkins.baseline>2.452</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.4</jenkins.version>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <useBeta>true</useBeta>
         <spotbugs.effort>Max</spotbugs.effort>
         <spotbugs.threshold>Low</spotbugs.threshold>

src/main/java/hudson/plugins/copyartifact/BuildSelectorParameter.java

@@ -42,7 +42,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * @author Alan Harder
@@ -99,7 +99,7 @@ public ParameterValue createValue(String value) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         return toStringValue(req.bindJSON(BuildSelector.class, jo));
     }
 

src/main/java/hudson/plugins/copyartifact/CopyArtifact.java

@@ -104,7 +104,7 @@
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -171,7 +171,7 @@ public CopyArtifact(String projectName, String parameters, BuildSelector selecto
     public CopyArtifact(String projectName) {
         if (CopyArtifactConfiguration.isMigrationMode()) {
             // check the permissions only if we can
-            StaplerRequest req = Stapler.getCurrentRequest();
+            StaplerRequest2 req = Stapler.getCurrentRequest2();
             if (req!=null) {
                 AbstractProject<?,?> p = req.findAncestorObject(AbstractProject.class);
                 if (p != null) {

src/main/java/hudson/plugins/copyartifact/CopyArtifactPermissionProperty.java

@@ -41,7 +41,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;
 
 import hudson.Extension;
 import hudson.model.AutoCompletionCandidates;
@@ -175,10 +175,10 @@ public String getPropertyName() {
          * @param formData Form data.
          * @return The created property.
          * @throws hudson.model.Descriptor.FormException If an error occurs parsing the form data.
-         * @see hudson.model.JobPropertyDescriptor#newInstance(org.kohsuke.stapler.StaplerRequest, net.sf.json.JSONObject)
+         * @see hudson.model.JobPropertyDescriptor#newInstance(org.kohsuke.stapler.StaplerRequest2, net.sf.json.JSONObject)
          */
         @Override
-        public CopyArtifactPermissionProperty newInstance(StaplerRequest req, JSONObject formData)
+        public CopyArtifactPermissionProperty newInstance(StaplerRequest2 req, JSONObject formData)
                 throws hudson.model.Descriptor.FormException {
             if(formData == null || formData.isNullObject()) {
                 return null;

src/main/java/hudson/plugins/copyartifact/TriggeredBuildSelector.java

@@ -43,7 +43,7 @@
 import org.jvnet.localizer.Localizable;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Copy artifacts from the build that triggered this build.
@@ -283,7 +283,7 @@ public UpstreamFilterStrategy getGlobalUpstreamFilterStrategy() {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject json)
+        public boolean configure(StaplerRequest2 req, JSONObject json)
                 throws hudson.model.Descriptor.FormException {
             setGlobalUpstreamFilterStrategy(UpstreamFilterStrategy.valueOf(json.getString("globalUpstreamFilterStrategy")));
             save();

src/main/java/hudson/plugins/copyartifact/monitor/LegacyJobConfigMigrationMonitor.java

@@ -51,15 +51,15 @@
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.json.JsonBody;
 import org.kohsuke.stapler.lang.Klass;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import net.jcip.annotations.GuardedBy;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.File;
 import java.io.IOException;
@@ -441,7 +441,7 @@ public static LegacyJobConfigMigrationMonitor get() {
      * @throws IOException servlet communication errors.
      */
     @Restricted(DoNotUse.class)
-    public void doHelpDetailedSteps(StaplerResponse rsp) throws IOException
+    public void doHelpDetailedSteps(StaplerResponse2 rsp) throws IOException
     {
         URL url = getStaticResourceUrl("help-detailedSteps");
         if (url == null) {
@@ -461,7 +461,7 @@ public void doHelpDetailedSteps(StaplerResponse rsp) throws IOException
      * @return the url of the resource.
      */
     private URL getStaticResourceUrl(String base) {
-        Locale locale = Stapler.getCurrentRequest().getLocale();
+        Locale locale = Stapler.getCurrentRequest2().getLocale();
         // allow to load html files.
         Klass<?> c = Klass.java(getClass());