Migrate from EE 8 to EE 9 (#313)

jenkinsci · Jan 22, 2025 · fe22b45 · fe22b45
1 parent ad00365
commit fe22b45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.5</version>
     <relativePath />
   </parent>
 
@@ -47,8 +47,8 @@
     <revision>1.0.6</revision>
     <changelist>-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>
   </properties>
 

diff --git a/src/main/java/hudson/plugins/ansicolor/AnsiColorBuildWrapper.java b/src/main/java/hudson/plugins/ansicolor/AnsiColorBuildWrapper.java
@@ -40,9 +40,9 @@
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -136,7 +136,7 @@ private void addAll(AnsiColorMap[] maps, Map<String, AnsiColorMap> to) {
 
 
         @Override
-        public boolean configure(final StaplerRequest req, final JSONObject formData) throws FormException {
+        public boolean configure(final StaplerRequest2 req, final JSONObject formData) throws FormException {
             try {
                 final List<AnsiColorMap> colorMaps = req.bindJSONToList(AnsiColorMap.class, req.getSubmittedForm().get("colorMap"));
                 for (AnsiColorMap colorMap : colorMaps) {

diff --git a/src/test/java/hudson/plugins/ansicolor/AnsiColorBuildWrapperTest.java b/src/test/java/hudson/plugins/ansicolor/AnsiColorBuildWrapperTest.java
@@ -11,11 +11,11 @@
 import org.junit.*;
 import org.junit.runner.RunWith;
 import org.jvnet.hudson.test.*;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.StringWriter;
@@ -506,7 +506,7 @@ public static final class DescriptorImplTest {
         private AnsiColorBuildWrapper.DescriptorImpl descriptor;
 
         @Mock
-        private StaplerRequest staplerRequest;
+        private StaplerRequest2 staplerRequest;
 
         @Rule
         public JenkinsRule jenkinsRule = new JenkinsRule();