Migrate from EE 8 to EE 9

Author: basil

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.5</version>
   </parent>
   <artifactId>matrix-auth</artifactId>
   <version>${revision}${changelist}</version>
@@ -28,16 +28,18 @@
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <hpi.compatibleSinceVersion>3.2</hpi.compatibleSinceVersion>
-    <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>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
   <dependencyManagement>
     <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>3893.v213a_42768d35</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java

@@ -68,7 +68,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.GET;
 
 /**
@@ -167,7 +167,7 @@ public PermissionScope getPermissionScope() {
         }
 
         @Override
-        public AuthorizationMatrixProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public AuthorizationMatrixProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return createNewInstance(req, formData, true);
         }
 

src/main/java/hudson/security/AuthorizationMatrixProperty.java

@@ -68,7 +68,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.GET;
 
 /**
@@ -205,7 +205,7 @@ public PermissionScope getPermissionScope() {
         }
 
         @Override
-        public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             return createNewInstance(req, formData, true);
         }
 

src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java

@@ -56,7 +56,7 @@
 import org.kohsuke.accmod.restrictions.DoNotUse;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Role-based authorization via a matrix.
@@ -162,7 +162,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public AuthorizationStrategy newInstance(StaplerRequest req, @NonNull JSONObject formData)
+        public AuthorizationStrategy newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
                 throws FormException {
             // TODO Is there a way to pull this up into AuthorizationContainerDescriptor and share code with
             // AuthorizationPropertyDescriptor?

src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java

@@ -57,7 +57,7 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class AuthorizationMatrixNodeProperty extends NodeProperty<Node> implements AuthorizationProperty {
 
@@ -164,7 +164,7 @@ public PermissionScope getPermissionScope() {
         }
 
         @Override
-        public AuthorizationMatrixNodeProperty newInstance(StaplerRequest req, @NonNull JSONObject formData)
+        public AuthorizationMatrixNodeProperty newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
                 throws FormException {
             return createNewInstance(req, formData, false);
         }

src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationPropertyDescriptor.java

@@ -23,6 +23,7 @@
  */
 package org.jenkinsci.plugins.matrixauth;
 
+import hudson.Util;
 import hudson.model.Descriptor;
 import hudson.security.Permission;
 import hudson.security.ProjectMatrixAuthorizationStrategy;
@@ -35,6 +36,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Interface with default methods common to all authorization related property descriptors.
@@ -48,8 +50,34 @@ public interface AuthorizationPropertyDescriptor<T extends AuthorizationProperty
 
     T create();
 
+    default T createNewInstance(StaplerRequest2 req, JSONObject formData, boolean hasOptionalWrap)
+            throws Descriptor.FormException {
+        if (Util.isOverridden(
+                AuthorizationPropertyDescriptor.class,
+                getClass(),
+                "createNewInstance",
+                StaplerRequest.class,
+                JSONObject.class,
+                boolean.class)) {
+            return createNewInstance(
+                    req != null ? StaplerRequest.fromStaplerRequest2(req) : null, formData, hasOptionalWrap);
+        } else {
+            return createNewInstanceImpl(req, formData, hasOptionalWrap);
+        }
+    }
+
+    /**
+     * @deprecated use {@link #createNewInstance(StaplerRequest2, JSONObject, boolean)}
+     */
+    @Deprecated
     default T createNewInstance(StaplerRequest req, JSONObject formData, boolean hasOptionalWrap)
             throws Descriptor.FormException {
+        return createNewInstanceImpl(
+                req != null ? StaplerRequest.toStaplerRequest2(req) : null, formData, hasOptionalWrap);
+    }
+
+    private T createNewInstanceImpl(StaplerRequest2 req, JSONObject formData, boolean hasOptionalWrap)
+            throws Descriptor.FormException {
         if (hasOptionalWrap) {
             formData = formData.getJSONObject("useProjectSecurity");
             if (formData.isNullObject()) return null;