Skip to content

Commit bb9a537

Browse files
basilbasil
authored
Migrate from EE 8 to EE 9 (#470)
1 parent 0ce7947 commit bb9a537

File tree

7 files changed

+29
-27
lines changed

7 files changed

+29
-27
lines changed

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
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.87</version>
7+
<version>5.6</version>
88
<relativePath />
99
</parent>
1010
<groupId>io.jenkins.plugins</groupId>
@@ -32,8 +32,8 @@
3232
<properties>
3333
<changelist>999999-SNAPSHOT</changelist>
3434
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
35-
<jenkins.baseline>2.440</jenkins.baseline>
36-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
35+
<jenkins.baseline>2.479</jenkins.baseline>
36+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
3737
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3838
<spotless.check.skip>false</spotless.check.skip>
3939
<hpi.compatibleSinceVersion>685</hpi.compatibleSinceVersion>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>io.jenkins.tools.bom</groupId>
4848
<artifactId>bom-${jenkins.baseline}.x</artifactId>
49-
<version>3289.v3ff9637cd241</version>
49+
<version>3850.vb_c5319efa_e29</version>
5050
<type>pom</type>
5151
<scope>import</scope>
5252
</dependency>

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
import hudson.util.HttpResponses;
1010
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
1111
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
12+
import jakarta.servlet.FilterChain;
13+
import jakarta.servlet.ServletException;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
1216
import java.io.IOException;
1317
import java.security.MessageDigest;
1418
import java.util.List;
1519
import java.util.logging.Level;
1620
import java.util.logging.Logger;
17-
import javax.servlet.FilterChain;
18-
import javax.servlet.ServletException;
19-
import javax.servlet.http.HttpServletRequest;
20-
import javax.servlet.http.HttpServletResponse;
2121
import jenkins.scm.api.SCMEvent;
2222
import org.apache.commons.lang.StringUtils;
2323
import org.gitlab4j.api.GitLabApiException;
2424
import org.gitlab4j.api.systemhooks.SystemHookManager;
2525
import org.kohsuke.stapler.HttpResponse;
2626
import org.kohsuke.stapler.StaplerRequest;
27+
import org.kohsuke.stapler.StaplerRequest2;
2728

2829
@Extension
2930
public final class GitLabSystemHookAction extends CrumbExclusion implements UnprotectedRootAction {
@@ -56,7 +57,7 @@ public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterC
5657
return false;
5758
}
5859

59-
public HttpResponse doPost(StaplerRequest request) throws GitLabApiException {
60+
public HttpResponse doPost(StaplerRequest2 request) throws GitLabApiException {
6061
if (!request.getMethod().equals("POST")) {
6162
return HttpResponses.error(
6263
HttpServletResponse.SC_BAD_REQUEST,
@@ -80,7 +81,7 @@ public HttpResponse doPost(StaplerRequest request) throws GitLabApiException {
8081
String origin = SCMEvent.originOf(request);
8182
SystemHookManager systemHookManager = new SystemHookManager();
8283
systemHookManager.addListener(new GitLabSystemHookListener(origin));
83-
systemHookManager.handleEvent(request);
84+
systemHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
8485
return HttpResponses.ok(); // TODO find a better response
8586
}
8687

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
import hudson.util.HttpResponses;
1010
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
1111
import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServers;
12+
import jakarta.servlet.FilterChain;
13+
import jakarta.servlet.ServletException;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
1216
import java.io.IOException;
1317
import java.security.MessageDigest;
1418
import java.util.List;
1519
import java.util.logging.Level;
1620
import java.util.logging.Logger;
17-
import javax.servlet.FilterChain;
18-
import javax.servlet.ServletException;
19-
import javax.servlet.http.HttpServletRequest;
20-
import javax.servlet.http.HttpServletResponse;
2121
import jenkins.scm.api.SCMEvent;
2222
import org.apache.commons.lang.StringUtils;
2323
import org.gitlab4j.api.GitLabApiException;
2424
import org.gitlab4j.api.webhook.WebHookManager;
2525
import org.kohsuke.stapler.HttpResponse;
2626
import org.kohsuke.stapler.StaplerRequest;
27+
import org.kohsuke.stapler.StaplerRequest2;
2728

2829
@Extension
2930
public final class GitLabWebHookAction extends CrumbExclusion implements UnprotectedRootAction {
@@ -56,7 +57,7 @@ public boolean process(HttpServletRequest req, HttpServletResponse resp, FilterC
5657
return false;
5758
}
5859

59-
public HttpResponse doPost(StaplerRequest request) throws IOException, GitLabApiException {
60+
public HttpResponse doPost(StaplerRequest2 request) throws IOException, GitLabApiException {
6061
if (!request.getMethod().equals("POST")) {
6162
return HttpResponses.error(
6263
HttpServletResponse.SC_BAD_REQUEST,
@@ -80,7 +81,7 @@ public HttpResponse doPost(StaplerRequest request) throws IOException, GitLabApi
8081
String origin = SCMEvent.originOf(request);
8182
WebHookManager webHookManager = new WebHookManager();
8283
webHookManager.addListener(new GitLabWebHookListener(origin));
83-
webHookManager.handleEvent(request);
84+
webHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
8485
return HttpResponses.ok(); // TODO find a better response
8586
}
8687

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabAvatarCache.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import hudson.util.HttpResponses;
1717
import hudson.util.NamingThreadFactory;
1818
import io.jenkins.plugins.gitlabbranchsource.GitLabSCMNavigator;
19+
import jakarta.servlet.ServletException;
20+
import jakarta.servlet.http.HttpServletResponse;
1921
import java.awt.Color;
2022
import java.awt.Graphics2D;
2123
import java.awt.image.BufferedImage;
@@ -43,14 +45,12 @@
4345
import java.util.logging.Level;
4446
import java.util.logging.Logger;
4547
import javax.imageio.ImageIO;
46-
import javax.servlet.ServletException;
47-
import javax.servlet.http.HttpServletResponse;
4848
import jenkins.model.Jenkins;
4949
import org.apache.commons.lang.StringUtils;
5050
import org.kohsuke.stapler.HttpResponse;
5151
import org.kohsuke.stapler.QueryParameter;
52-
import org.kohsuke.stapler.StaplerRequest;
53-
import org.kohsuke.stapler.StaplerResponse;
52+
import org.kohsuke.stapler.StaplerRequest2;
53+
import org.kohsuke.stapler.StaplerResponse2;
5454

5555
/**
5656
* An avatar cache that will serve URLs that have been recently registered
@@ -260,7 +260,7 @@ public String getUrlName() {
260260
* @param size the requested size (defaults to {@code 48x48} if unspecified).
261261
* @return the response.
262262
*/
263-
public HttpResponse doDynamic(StaplerRequest req, @QueryParameter String size) {
263+
public HttpResponse doDynamic(StaplerRequest2 req, @QueryParameter String size) {
264264
if (StringUtils.isBlank(req.getRestOfPath())) {
265265
return HttpResponses.notFound();
266266
}
@@ -303,7 +303,7 @@ public HttpResponse doDynamic(StaplerRequest req, @QueryParameter String size) {
303303
if (avatar.lastModified <= since) {
304304
return new HttpResponse() {
305305
@Override
306-
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
306+
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
307307
throws IOException, ServletException {
308308
rsp.addDateHeader("Last-Modified", avatar.lastModified);
309309
rsp.addHeader("Cache-control", "max-age=3600, public");
@@ -467,7 +467,7 @@ public ImageResponse(BufferedImage image, boolean flushImage, long lastModified,
467467
}
468468

469469
@Override
470-
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node)
470+
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node)
471471
throws IOException, ServletException {
472472
ByteArrayOutputStream bos = new ByteArrayOutputStream();
473473
try {

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabBrowser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.sf.json.JSONObject;
1818
import org.jenkinsci.Symbol;
1919
import org.kohsuke.stapler.DataBoundConstructor;
20-
import org.kohsuke.stapler.StaplerRequest;
20+
import org.kohsuke.stapler.StaplerRequest2;
2121

2222
public class GitLabBrowser extends GitRepositoryBrowser {
2323

@@ -89,7 +89,7 @@ public String getDisplayName() {
8989
}
9090

9191
@Override
92-
public GitLabBrowser newInstance(StaplerRequest req, @NonNull JSONObject jsonObject) throws FormException {
92+
public GitLabBrowser newInstance(StaplerRequest2 req, @NonNull JSONObject jsonObject) throws FormException {
9393
return req.bindJSON(GitLabBrowser.class, jsonObject);
9494
}
9595
}

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabIcons.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static String iconFileName(String name, Size size) {
4444
}
4545

4646
JellyContext ctx = new JellyContext();
47-
ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
47+
ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);
4848
return icon.getQualifiedUrl(ctx);
4949
}
5050

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabLink.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public String getIconFileName() {
8383
Icon icon = IconSet.icons.getIconByClassSpec(iconClassName + " icon-md");
8484
if (icon != null) {
8585
JellyContext ctx = new JellyContext();
86-
ctx.setVariable("resURL", Stapler.getCurrentRequest().getContextPath() + Jenkins.RESOURCE_PATH);
86+
ctx.setVariable("resURL", Stapler.getCurrentRequest2().getContextPath() + Jenkins.RESOURCE_PATH);
8787
return icon.getQualifiedUrl(ctx);
8888
}
8989
return null;

0 commit comments

Comments
 (0)