Skip to content

Commit 6802bf0

Browse files
authoredFeb 7, 2025··
Migrate from EE 8 to EE 9 (#292)
1 parent 0e0888f commit 6802bf0

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
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.7</version>
88
<relativePath/>
99
</parent>
1010
<artifactId>mercurial</artifactId>
@@ -17,8 +17,8 @@
1717
<properties>
1818
<changelist>999999-SNAPSHOT</changelist>
1919
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
20-
<jenkins.baseline>2.452</jenkins.baseline>
21-
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
20+
<jenkins.baseline>2.479</jenkins.baseline>
21+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
2222
<no-test-jar>false</no-test-jar>
2323
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
2424
</properties>

‎src/main/java/hudson/plugins/mercurial/MercurialSCM.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import org.kohsuke.stapler.DataBoundConstructor;
7474
import org.kohsuke.stapler.DataBoundSetter;
7575
import org.kohsuke.stapler.QueryParameter;
76-
import org.kohsuke.stapler.StaplerRequest;
76+
import org.kohsuke.stapler.StaplerRequest2;
7777

7878
/**
7979
* Mercurial SCM.
@@ -1040,12 +1040,12 @@ public String getHgExe() {
10401040
}
10411041

10421042
@Override
1043-
public SCM newInstance(StaplerRequest req, JSONObject formData) throws FormException {
1043+
public SCM newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
10441044
return super.newInstance(req, formData);
10451045
}
10461046

10471047
@Override
1048-
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
1048+
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
10491049
hgExe = req.getParameter("mercurial.hgExe");
10501050
save();
10511051
return true;

‎src/main/java/hudson/plugins/mercurial/MercurialStatus.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.List;
1717
import java.util.logging.Level;
1818
import java.util.logging.Logger;
19-
import javax.servlet.ServletException;
19+
import jakarta.servlet.ServletException;
2020
import jenkins.model.Jenkins;
2121
import jenkins.scm.api.SCMEvent;
2222
import jenkins.scm.api.SCMHeadEvent;
@@ -31,12 +31,12 @@
3131
import org.kohsuke.stapler.HttpResponses;
3232
import org.kohsuke.stapler.QueryParameter;
3333
import org.kohsuke.stapler.Stapler;
34-
import org.kohsuke.stapler.StaplerRequest;
35-
import org.kohsuke.stapler.StaplerResponse;
34+
import org.kohsuke.stapler.StaplerRequest2;
35+
import org.kohsuke.stapler.StaplerResponse2;
3636
import org.springframework.security.core.Authentication;
3737

38-
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
39-
import static javax.servlet.http.HttpServletResponse.SC_OK;
38+
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
39+
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
4040
/**
4141
* Information screen for the use of Mercurial in Jenkins.
4242
*/
@@ -106,7 +106,7 @@ static boolean looselyMatches(URI notifyUri, String repository) {
106106
public HttpResponse doNotifyCommit(@QueryParameter(required=true) final String url,
107107
@QueryParameter String branch,
108108
@QueryParameter String changesetId) throws ServletException, IOException {
109-
String origin = SCMEvent.originOf(Stapler.getCurrentRequest());
109+
String origin = SCMEvent.originOf(Stapler.getCurrentRequest2());
110110
// run in high privilege to see all the projects anonymous users don't see.
111111
// this is safe because we only initiate polling.
112112
// But we shouldn't disclose the item names to users that is not supposed to see them
@@ -202,7 +202,7 @@ private HttpResponse handleNotifyCommit(String origin, URI url, final Authentica
202202

203203
return new HttpResponse() {
204204
@SuppressWarnings("deprecation")
205-
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
205+
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
206206
rsp.setStatus(SC_OK);
207207
rsp.setContentType("text/plain");
208208
for (Item p : projects) {

‎src/main/java/hudson/plugins/mercurial/MercurialStatusCrumbExclusion.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
import hudson.Extension;
2929
import hudson.security.csrf.CrumbExclusion;
3030
import java.io.IOException;
31-
import javax.servlet.FilterChain;
32-
import javax.servlet.ServletException;
33-
import javax.servlet.http.HttpServletRequest;
34-
import javax.servlet.http.HttpServletResponse;
31+
import jakarta.servlet.FilterChain;
32+
import jakarta.servlet.ServletException;
33+
import jakarta.servlet.http.HttpServletRequest;
34+
import jakarta.servlet.http.HttpServletResponse;
3535
import org.apache.commons.lang.StringUtils;
3636

3737
/**

0 commit comments

Comments
 (0)
Please sign in to comment.