Migrate from EE 8 to EE 9 (#143)

Author: basil

Jenkinsfile

@@ -2,6 +2,6 @@
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
 buildPlugin(useContainerAgent: true, configurations: [
-  [platform: 'linux', jdk: 11],
+  [platform: 'linux', jdk: 21],
   [platform: 'windows', jdk: 17],
 ])

pom.xml

@@ -5,7 +5,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.72</version>
+        <version>5.7</version>
+        <relativePath />
     </parent>
 
     <artifactId>vsphere-cloud</artifactId>
@@ -61,8 +62,8 @@
         <revision>2.28</revision>
         <changelist>-SNAPSHOT</changelist>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.387</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <spotbugs.skip>true</spotbugs.skip>
     </properties>
@@ -72,7 +73,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>2329.v078520e55c19</version>
+                <version>3944.v1a_e4f8b_452db_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -116,7 +117,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>node-iterator-api</artifactId>
-            <version>49.v58a_8b_35f8363</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

src/main/java/org/jenkinsci/plugins/vSphereCloud.java

@@ -26,7 +26,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 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.CheckForNull;
 import java.io.IOException;
@@ -603,8 +603,8 @@ public static List<vSphereCloud> findAllVsphereClouds(String jobName) {
         String[] path = new String[0];
         Folder prevFolder = null;
 
-        if (Stapler.getCurrentRequest() != null){
-            path = Stapler.getCurrentRequest().getRequestURI().split("/");
+        if (Stapler.getCurrentRequest2() != null){
+            path = Stapler.getCurrentRequest2().getRequestURI().split("/");
         } else if (jobName != null) {
             path = jobName.split("/");
         }
@@ -685,7 +685,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public boolean configure(StaplerRequest req, JSONObject o)
+        public boolean configure(StaplerRequest2 req, JSONObject o)
                 throws FormException {
             vsHost = o.getString("vsHost");
             username = o.getString("username");

src/main/java/org/jenkinsci/plugins/vsphere/VSphereBuildStepContainer.java

@@ -155,7 +155,7 @@ public ListBoxModel doFillServerNameItems(@AncestorInPath Item context) {
             Folder prevFolder = null;
 
             try {
-                String[] path = Stapler.getCurrentRequest().getRequestURI().split("/");
+                String[] path = Stapler.getCurrentRequest2().getRequestURI().split("/");
                 for (String item : path) {
 
                     if (item.equals("job") || item.equals("jenkins"))

src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureCpu.java

@@ -26,7 +26,7 @@
 import org.kohsuke.stapler.QueryParameter;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
 

src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureDisk.java

@@ -34,7 +34,7 @@
 import org.kohsuke.stapler.QueryParameter;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 import java.io.IOException;
 import java.io.PrintStream;

src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureMemory.java

@@ -26,7 +26,7 @@
 import org.kohsuke.stapler.QueryParameter;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
 

src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureNetworkAdapters.java

@@ -31,7 +31,7 @@
 import org.kohsuke.stapler.QueryParameter;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Arrays;

src/main/java/org/jenkinsci/plugins/vsphere/parameters/CloudSelectorParameter.java

@@ -12,7 +12,7 @@
 import org.jenkinsci.plugins.vSphereCloud;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.export.Exported;
 
 import java.util.List;
@@ -43,7 +43,7 @@ private StringParameterValue checkValue(StringParameterValue value) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         StringParameterValue value = req.bindJSON(StringParameterValue.class, jo);
         value.setDescription(getDescription());
         return checkValue(value);