Migrate from EE 8 to EE 9 (#304)

jenkinsci · Jan 17, 2025 · 91adcc2 · 91adcc2
1 parent 212bc99
commit 91adcc2
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 35 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.4</version>
+    <version>5.5</version>
     <relativePath />
   </parent>
 
@@ -69,7 +69,6 @@
       <groupId>hudson.queueSorter</groupId>
       <artifactId>PrioritySorter</artifactId>
       <version>1.3</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -79,12 +78,10 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jakarta-activation-api</artifactId>
-      <version>2.1.3-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jakarta-mail-api</artifactId>
-      <version>2.1.3-1</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
@@ -103,7 +100,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>build-timeout</artifactId>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -179,7 +175,6 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>python</artifactId>
       <version>1.3</version>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -193,7 +188,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>timestamper</artifactId>
-      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -220,15 +214,6 @@
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>jython</artifactId>
       <version>1.9</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <!-- satisfy upper bounds dependency error -->
-      <artifactId>commons-net</artifactId>
-      <version>3.11.1</version>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/src/main/java/configurationslicing/BooleanSlice.java b/src/main/java/configurationslicing/BooleanSlice.java
@@ -11,7 +11,7 @@
 import java.util.Map;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class BooleanSlice<I> extends Slice {
     private Map<String, Boolean> nameToValue;
@@ -62,7 +62,7 @@ public List<I> getConfiguredItems() {
     }
 
     @Override
-    public Slice newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+    public Slice newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
         return new BooleanSlice<I>(
                 BooleanSlice.this.spec, req.bindJSONToList(ItemState.class, formData.get("itemstate")));
     }

diff --git a/src/main/java/configurationslicing/ConfigurationSlicing.java b/src/main/java/configurationslicing/ConfigurationSlicing.java
@@ -9,16 +9,16 @@
 import hudson.model.View;
 import hudson.model.ViewGroup;
 import hudson.security.Permission;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 @Extension
@@ -103,7 +103,7 @@ private void addViews(String baseName, Collection<View> views, List<String> name
         }
     }
 
-    public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+    public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
         Jenkins.get().checkPermission(Hudson.ADMINISTER);
 
         for (Slicer s : getAxes()) {
@@ -188,7 +188,8 @@ public List<I> getWorklist() {
         }
 
         @RequirePOST
-        public void doSliceconfigSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+        public void doSliceconfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp)
+                throws IOException, ServletException {
             String pathInfo = req.getPathInfo();
             try {
                 T newslice = (T) slice.newInstance(req, req.getSubmittedForm());
@@ -212,7 +213,7 @@ private String getRedirectPath(String pathInfo) {
             }
         }
 
-        public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
+        public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) {
             Jenkins.get().checkPermission(Hudson.ADMINISTER);
             String viewName = req.getParameter("view");
             View view = null;

diff --git a/src/main/java/configurationslicing/ParametersStringSlice.java b/src/main/java/configurationslicing/ParametersStringSlice.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.logging.Logger;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class ParametersStringSlice<I> extends UnorderedStringSlice<I> {
 
@@ -24,7 +24,7 @@ public UnorderedStringSlice<I> getInitialAccumulator() {
     }
 
     @Override
-    public Slice newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+    public Slice newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
         /*
         {"itemNames":
         ["MD\n","Secure-A-1\nSecure-A-2\nSecure-B-1\nSecure-B-2\n",""],

diff --git a/src/main/java/configurationslicing/Slice.java b/src/main/java/configurationslicing/Slice.java
@@ -2,8 +2,8 @@
 
 import hudson.model.Descriptor.FormException;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public abstract class Slice {
-    public abstract Slice newInstance(StaplerRequest req, JSONObject formData) throws FormException;
+    public abstract Slice newInstance(StaplerRequest2 req, JSONObject formData) throws FormException;
 }
diff --git a/src/main/java/configurationslicing/UnorderedStringSlice.java b/src/main/java/configurationslicing/UnorderedStringSlice.java
@@ -16,7 +16,7 @@
 import java.util.logging.Logger;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class UnorderedStringSlice<I> extends Slice {
 
@@ -162,7 +162,7 @@ public List<String> getItemNames(String configurationString) {
     }
 
     @Override
-    public Slice newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+    public Slice newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
         return new UnorderedStringSlice<I>(
                 UnorderedStringSlice.this.spec,
                 getStringList(formData, "configValue"),

diff --git a/src/main/java/configurationslicing/executeshell/ExecuteJythonSlicer.java b/src/main/java/configurationslicing/executeshell/ExecuteJythonSlicer.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import net.sf.json.JSONObject;
 import org.jvnet.hudson.plugins.Jython;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Slicer for the jython builder
@@ -40,10 +40,14 @@ public String getUrl() {
         @Override
         public Jython createBuilder(String command, List<Jython> existingBuilders, Jython oldBuilder) {
             // this is an unfortunate workaround that is necessary due to the Jython constructor being private
-            StaplerRequest req = null;
+            StaplerRequest2 req = null;
             JSONObject formData = new JSONObject();
             formData.put("jython", command);
-            return (Jython) JYTHON_DESCRIPTOR.newInstance(req, formData);
+            try {
+                return (Jython) JYTHON_DESCRIPTOR.newInstance(req, formData);
+            } catch (Descriptor.FormException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         @Override

diff --git a/src/main/java/configurationslicing/executeshell/ExecutePythonSlicer.java b/src/main/java/configurationslicing/executeshell/ExecutePythonSlicer.java
@@ -9,7 +9,7 @@
 import java.lang.reflect.Modifier;
 import java.util.List;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Slicer for the python builder
@@ -59,7 +59,7 @@ public Python createBuilder(String command, List<Python> existingBuilders, Pytho
             if (python == null) {
                 // this is an unfortunate workaround that is necessary due to the Python constructor being private in
                 // certain versions
-                StaplerRequest req = null;
+                StaplerRequest2 req = null;
                 JSONObject formData = new JSONObject();
                 formData.put("python", command);
                 try {