Skip to content

Commit fe22b45

Browse files
authored
Migrate from EE 8 to EE 9 (#313)
1 parent ad00365 commit fe22b45

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.88</version>
7+
<version>5.5</version>
88
<relativePath />
99
</parent>
1010

@@ -47,8 +47,8 @@
4747
<revision>1.0.6</revision>
4848
<changelist>-SNAPSHOT</changelist>
4949
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
50-
<jenkins.baseline>2.452</jenkins.baseline>
51-
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
50+
<jenkins.baseline>2.479</jenkins.baseline>
51+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
5252
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
5353
</properties>
5454

src/main/java/hudson/plugins/ansicolor/AnsiColorBuildWrapper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
import net.sf.json.JSONObject;
4141
import org.kohsuke.stapler.DataBoundConstructor;
4242
import org.kohsuke.stapler.QueryParameter;
43-
import org.kohsuke.stapler.StaplerRequest;
43+
import org.kohsuke.stapler.StaplerRequest2;
4444

45-
import javax.servlet.ServletException;
45+
import jakarta.servlet.ServletException;
4646
import java.io.IOException;
4747
import java.io.Serializable;
4848
import java.util.HashMap;
@@ -136,7 +136,7 @@ private void addAll(AnsiColorMap[] maps, Map<String, AnsiColorMap> to) {
136136

137137

138138
@Override
139-
public boolean configure(final StaplerRequest req, final JSONObject formData) throws FormException {
139+
public boolean configure(final StaplerRequest2 req, final JSONObject formData) throws FormException {
140140
try {
141141
final List<AnsiColorMap> colorMaps = req.bindJSONToList(AnsiColorMap.class, req.getSubmittedForm().get("colorMap"));
142142
for (AnsiColorMap colorMap : colorMaps) {

src/test/java/hudson/plugins/ansicolor/AnsiColorBuildWrapperTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import org.junit.*;
1212
import org.junit.runner.RunWith;
1313
import org.jvnet.hudson.test.*;
14-
import org.kohsuke.stapler.StaplerRequest;
14+
import org.kohsuke.stapler.StaplerRequest2;
1515
import org.mockito.Mock;
1616
import org.mockito.junit.MockitoJUnitRunner;
1717

18-
import javax.servlet.ServletException;
18+
import jakarta.servlet.ServletException;
1919
import java.io.IOException;
2020
import java.io.PrintStream;
2121
import java.io.StringWriter;
@@ -506,7 +506,7 @@ public static final class DescriptorImplTest {
506506
private AnsiColorBuildWrapper.DescriptorImpl descriptor;
507507

508508
@Mock
509-
private StaplerRequest staplerRequest;
509+
private StaplerRequest2 staplerRequest;
510510

511511
@Rule
512512
public JenkinsRule jenkinsRule = new JenkinsRule();

0 commit comments

Comments
 (0)