Migrate from EE 8 to EE 9 (#149)

Author: basil

pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.5</version>
         <relativePath/>
     </parent>
     <groupId>io.jenkins.plugins</groupId>
@@ -64,8 +64,8 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <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>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <useBeta>true</useBeta>
     </properties>

src/main/java/org/jenkinsci/plugins/workflow/libs/AbstractGlobalLibraries.java

@@ -35,7 +35,7 @@
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Common code between {@link GlobalLibraries} and {@link GlobalUntrustedLibraries}.
@@ -58,7 +58,7 @@ public void setLibraries(List<LibraryConfiguration> libraries) {
         save();
     }
 
-    @Override public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    @Override public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         if (Jenkins.get().hasPermission(getRequiredGlobalConfigPagePermission())) {
             setLibraries(Collections.emptyList()); // allow last library to be deleted
             return super.configure(req, json);
@@ -75,7 +75,7 @@ abstract static class AbstractForJob extends LibraryResolver {
             return getLibraries();
         }
 
-        @NonNull @Override public final Collection<LibraryConfiguration> fromConfiguration(@NonNull StaplerRequest request) {
+        @NonNull @Override public final Collection<LibraryConfiguration> fromConfiguration(@NonNull StaplerRequest2 request) {
             if (Jenkins.get().hasPermission(getConfiguration().getRequiredGlobalConfigPagePermission())) {
                 return getLibraries();
             }

src/main/java/org/jenkinsci/plugins/workflow/libs/FolderLibraries.java

@@ -38,7 +38,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Like {@link GlobalLibraries} but scoped to a folder.
@@ -57,7 +57,7 @@ public List<LibraryConfiguration> getLibraries() {
 
     @Extension public static class DescriptorImpl extends AbstractFolderPropertyDescriptor {
 
-        @Override public AbstractFolderProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+        @Override public AbstractFolderProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
             FolderLibraries prop = (FolderLibraries) super.newInstance(req, formData);
             return prop.libraries.isEmpty() ? null : prop;
         }
@@ -91,7 +91,7 @@ private Collection<LibraryConfiguration> forGroup(@CheckForNull ItemGroup<?> gro
             return forGroup(job.getParent(), false);
         }
 
-        @Override public Collection<LibraryConfiguration> fromConfiguration(StaplerRequest request) {
+        @Override public Collection<LibraryConfiguration> fromConfiguration(StaplerRequest2 request) {
             return forGroup(request.findAncestorObject(AbstractFolder.class), true);
         }
 

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryConfiguration.java

@@ -41,7 +41,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 org.kohsuke.stapler.interceptor.RequirePOST;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
@@ -158,7 +158,7 @@ public LibraryCachingConfiguration getCachingConfiguration() {
         // TODO JENKINS-20020 ought to be unnecessary
         @Restricted(NoExternalUse.class) // Jelly
         public Collection<LibraryRetrieverDescriptor> getRetrieverDescriptors() {
-            StaplerRequest req = Stapler.getCurrentRequest();
+            StaplerRequest2 req = Stapler.getCurrentRequest2();
             Item it = req != null ? req.findAncestorObject(Item.class) : null;
             return DescriptorVisibilityFilter.apply(it != null ? it : Jenkins.get(), ExtensionList.lookup(LibraryRetrieverDescriptor.class));
         }
@@ -183,7 +183,7 @@ public FormValidation doCheckDefaultVersion(@AncestorInPath Item context, @Query
                 return FormValidation.ok();
             } else {
                 for (LibraryResolver resolver : ExtensionList.lookup(LibraryResolver.class)) {
-                    for (LibraryConfiguration config : resolver.fromConfiguration(Stapler.getCurrentRequest())) {
+                    for (LibraryConfiguration config : resolver.fromConfiguration(Stapler.getCurrentRequest2())) {
                         if (config.getName().equals(name)) {
                             return config.getRetriever().validateVersion(name, defaultVersion, context);
                         }
@@ -197,7 +197,7 @@ public FormValidation doCheckDefaultVersion(@AncestorInPath Item context, @Query
         public AutoCompletionCandidates doAutoCompleteDefaultVersion(@AncestorInPath Item context, @QueryParameter String defaultVersion, @QueryParameter String name) {
             AutoCompletionCandidates candidates = new AutoCompletionCandidates();
             for (LibraryResolver resolver : ExtensionList.lookup(LibraryResolver.class)) {
-                for LibraryConfiguration config : resolver.fromConfiguration(Stapler.getCurrentRequest()) {
+                for LibraryConfiguration config : resolver.fromConfiguration(Stapler.getCurrentRequest2()) {
                     // TODO define LibraryRetriever.completeVersions
                     if (config.getName().equals(name) && config.getRetriever() instanceof SCMSourceRetriever) {
                         try {

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryResolver.java

@@ -31,7 +31,7 @@
 import java.util.Collections;
 import java.util.Map;
 import edu.umd.cs.findbugs.annotations.NonNull;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Allows a provider of libraries to indicate which libraries should be visible to a given job.
@@ -70,7 +70,7 @@ public abstract class LibraryResolver implements ExtensionPoint {
      * @param request a web request
      * @return known libraries, if any (empty by default)
      */
-    public @NonNull Collection<LibraryConfiguration> fromConfiguration(@NonNull StaplerRequest request) {
+    public @NonNull Collection<LibraryConfiguration> fromConfiguration(@NonNull StaplerRequest2 request) {
         return Collections.emptySet();
     }