Skip to content

Commit fc8b92d

Browse files
basilbasil
authored
Migrate from EE 8 to EE 9 (#333)
1 parent 40f99f2 commit fc8b92d

File tree

12 files changed

+46
-45
lines changed

12 files changed

+46
-45
lines changed

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
<parent>
3030
<groupId>org.jenkins-ci.plugins</groupId>
3131
<artifactId>plugin</artifactId>
32-
<version>4.88</version>
32+
<version>5.5</version>
3333
<relativePath />
3434
</parent>
3535

@@ -60,7 +60,7 @@ THE SOFTWARE.
6060
<useBeta>true</useBeta>
6161
<changelist>999999-SNAPSHOT</changelist>
6262
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
63-
<jenkins.baseline>2.462</jenkins.baseline>
63+
<jenkins.baseline>2.479</jenkins.baseline>
6464
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
6565
<no-test-jar>false</no-test-jar>
6666
<spotbugs.threshold>High</spotbugs.threshold> <!-- TODO some violations remaining -->
@@ -85,7 +85,7 @@ THE SOFTWARE.
8585
<dependency>
8686
<groupId>io.jenkins.tools.bom</groupId>
8787
<artifactId>bom-${jenkins.baseline}.x</artifactId>
88-
<version>3258.vcdcf15936a_fd</version>
88+
<version>3850.vb_c5319efa_e29</version>
8989
<scope>import</scope>
9090
<type>pom</type>
9191
</dependency>

‎src/main/java/hudson/scm/SubversionRepositoryStatus.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static java.util.logging.Level.FINE;
44
import static java.util.logging.Level.FINER;
55
import static java.util.logging.Level.WARNING;
6-
import static javax.servlet.http.HttpServletResponse.SC_OK;
6+
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
77

88
import hudson.Extension;
99
import hudson.ExtensionList;
@@ -28,13 +28,13 @@
2828
import java.util.logging.Level;
2929
import java.util.logging.Logger;
3030

31-
import javax.servlet.ServletException;
31+
import jakarta.servlet.ServletException;
3232

3333
import jenkins.model.Jenkins;
3434
import jenkins.triggers.SCMTriggerItem;
3535
import org.apache.commons.io.IOUtils;
36-
import org.kohsuke.stapler.StaplerRequest;
37-
import org.kohsuke.stapler.StaplerResponse;
36+
import org.kohsuke.stapler.StaplerRequest2;
37+
import org.kohsuke.stapler.StaplerResponse2;
3838

3939
import org.kohsuke.stapler.interceptor.RequirePOST;
4040
import org.tmatesoft.svn.core.SVNCancelException;
@@ -89,7 +89,7 @@ public static abstract class Listener implements ExtensionPoint {
8989
* don't protect this URL to simplify <code>post-commit</code> script set up.
9090
*/
9191
@RequirePOST
92-
public void doNotifyCommit(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
92+
public void doNotifyCommit(StaplerRequest2 req, StaplerResponse2 rsp) throws ServletException, IOException {
9393
// compute the affected paths
9494
Set<String> affectedPath = new HashSet<>();
9595
String line;

‎src/main/java/hudson/scm/SubversionSCM.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
import java.util.regex.Pattern;
154154
import java.util.regex.PatternSyntaxException;
155155

156-
import javax.servlet.ServletException;
156+
import jakarta.servlet.ServletException;
157157
import javax.xml.transform.stream.StreamResult;
158158

159159
import jenkins.scm.impl.subversion.RemotableSVNErrorMessage;
@@ -169,8 +169,8 @@
169169
import org.kohsuke.stapler.AncestorInPath;
170170
import org.kohsuke.stapler.DataBoundConstructor;
171171
import org.kohsuke.stapler.QueryParameter;
172-
import org.kohsuke.stapler.StaplerRequest;
173-
import org.kohsuke.stapler.StaplerResponse;
172+
import org.kohsuke.stapler.StaplerRequest2;
173+
import org.kohsuke.stapler.StaplerResponse2;
174174
import org.kohsuke.stapler.export.Exported;
175175
import org.kohsuke.stapler.export.ExportedBean;
176176
import org.kohsuke.stapler.verb.POST;
@@ -1920,7 +1920,11 @@ public SVNAuthentication createSVNAuthentication(String kind) {
19201920

19211921
@Override
19221922
public StandardCredentials toCredentials(String description) {
1923-
return new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, null, description, userName, getPassword());
1923+
try {
1924+
return new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, null, description, userName, getPassword());
1925+
} catch (Descriptor.FormException e) {
1926+
throw new RuntimeException(e);
1927+
}
19241928
}
19251929

19261930
@Override
@@ -2176,7 +2180,7 @@ private Object writeReplace() {
21762180
}
21772181

21782182
@Override
2179-
public SCM newInstance(StaplerRequest staplerRequest, JSONObject jsonObject) throws FormException {
2183+
public SCM newInstance(StaplerRequest2 staplerRequest, JSONObject jsonObject) throws FormException {
21802184
return super.newInstance(staplerRequest, jsonObject);
21812185
}
21822186

@@ -2225,7 +2229,7 @@ public boolean isStoreAuthToDisk() {
22252229
}
22262230

22272231
@Override
2228-
public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
2232+
public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
22292233
globalExcludedRevprop = fixEmptyAndTrim(
22302234
req.getParameter("svn.global_excluded_revprop"));
22312235
workspaceFormat = Integer.parseInt(req.getParameter("svn.workspaceFormat"));
@@ -2290,7 +2294,7 @@ public ISVNAuthenticationProvider createAuthenticationProvider() {
22902294
*/
22912295
// TODO: stapler should do multipart/form-data handling
22922296
@POST
2293-
public void doPostCredential(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
2297+
public void doPostCredential(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
22942298
Jenkins.getInstance().checkPermission(Item.CONFIGURE);
22952299

22962300
MultipartFormDataParser parser = new MultipartFormDataParser(req);
@@ -2358,7 +2362,7 @@ public void postCredential(String url, final UserProvidedCredential upc, PrintWr
23582362
@CheckForNull
23592363
@Deprecated
23602364
@RequirePOST
2361-
public FormValidation doCheckRemote(StaplerRequest req, @AncestorInPath AbstractProject context, @QueryParameter String value, @QueryParameter String credentialsId) {
2365+
public FormValidation doCheckRemote(StaplerRequest2 req, @AncestorInPath AbstractProject context, @QueryParameter String value, @QueryParameter String credentialsId) {
23622366
Jenkins instance = Jenkins.getInstance();
23632367
if (instance != null) {
23642368
ModuleLocation.DescriptorImpl d = instance.getDescriptorByType(ModuleLocation.DescriptorImpl.class);
@@ -3201,7 +3205,7 @@ public ListBoxModel fillCredentialsIdItems(@CheckForNull Item context, String re
32013205
* Validate the value for a remote (repository) location.
32023206
*/
32033207
@RequirePOST
3204-
public FormValidation doCheckRemote(/* TODO unused, delete */StaplerRequest req, @AncestorInPath Item context,
3208+
public FormValidation doCheckRemote(/* TODO unused, delete */StaplerRequest2 req, @AncestorInPath Item context,
32053209
@QueryParameter String value) {
32063210

32073211
// repository URL is required
@@ -3229,7 +3233,7 @@ public FormValidation doCheckRemote(/* TODO unused, delete */StaplerRequest req,
32293233
* Validate the value for a remote (repository) location.
32303234
*/
32313235
@RequirePOST
3232-
public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath Item context,
3236+
public FormValidation doCheckCredentialsId(StaplerRequest2 req, @AncestorInPath Item context,
32333237
@QueryParameter String remote, @QueryParameter String value) {
32343238

32353239
// Test the connection only if we may use the credentials (cf. hudson.plugins.git.UserRemoteConfig.DescriptorImpl.doCheckUrl)
@@ -3243,7 +3247,7 @@ public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath I
32433247
/**
32443248
* Validate the value for a remote (repository) location.
32453249
*/
3246-
public FormValidation checkCredentialsId(/* TODO unused, delete */StaplerRequest req, @NonNull Item context, String remote, String value) {
3250+
public FormValidation checkCredentialsId(/* TODO unused, delete */StaplerRequest2 req, @NonNull Item context, String remote, String value) {
32473251

32483252
// Ignore validation if repository URL is empty
32493253
String url = Util.fixEmptyAndTrim(remote);

‎src/main/java/hudson/scm/SubversionTagAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
import jenkins.model.Jenkins;
5353
import org.acegisecurity.Authentication;
5454
import org.kohsuke.stapler.AncestorInPath;
55-
import org.kohsuke.stapler.StaplerRequest;
56-
import org.kohsuke.stapler.StaplerResponse;
55+
import org.kohsuke.stapler.StaplerRequest2;
56+
import org.kohsuke.stapler.StaplerResponse2;
5757
import org.kohsuke.stapler.export.Exported;
5858
import org.kohsuke.stapler.export.ExportedBean;
5959
import org.kohsuke.stapler.verb.POST;
@@ -66,7 +66,7 @@
6666
import org.tmatesoft.svn.core.wc.SVNCopySource;
6767
import org.tmatesoft.svn.core.wc.SVNWCUtil;
6868

69-
import javax.servlet.ServletException;
69+
import jakarta.servlet.ServletException;
7070
import java.io.File;
7171
import java.io.IOException;
7272
import java.io.PrintStream;
@@ -215,7 +215,7 @@ public String makeTagURL(SvnInfo si) {
215215
* Invoked to actually tag the workspace.
216216
*/
217217
@POST
218-
public synchronized void doSubmit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
218+
public synchronized void doSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
219219
getACL().checkPermission(getPermission());
220220

221221
MultipartFormDataParser parser = new MultipartFormDataParser(req);

‎src/main/java/hudson/scm/UserProvidedCredential.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.apache.commons.fileupload.FileItem;
4040
import org.kohsuke.putty.PuTTYKey;
4141
import org.kohsuke.stapler.HttpResponses;
42-
import org.kohsuke.stapler.StaplerRequest;
42+
import org.kohsuke.stapler.StaplerRequest2;
4343
import org.tmatesoft.svn.core.SVNCancelException;
4444
import org.tmatesoft.svn.core.SVNErrorMessage;
4545
import org.tmatesoft.svn.core.SVNException;
@@ -59,7 +59,7 @@
5959
import java.util.Arrays;
6060
import java.util.logging.Logger;
6161

62-
import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
62+
import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
6363
import jenkins.util.JenkinsJVM;
6464

6565
/**
@@ -97,7 +97,7 @@ public UserProvidedCredential(String username, String password, File keyFile, Ab
9797
/**
9898
* Parses the credential information from a form submission.
9999
*/
100-
public static UserProvidedCredential fromForm(StaplerRequest req, MultipartFormDataParser parser) throws IOException {
100+
public static UserProvidedCredential fromForm(StaplerRequest2 req, MultipartFormDataParser parser) throws IOException {
101101
CrumbIssuer crumbIssuer = Jenkins.getInstance().getCrumbIssuer();
102102
if (crumbIssuer!=null && !crumbIssuer.validateCrumb(req, parser))
103103
throw HttpResponses.error(SC_FORBIDDEN,new IOException("No crumb found"));

‎src/main/java/hudson/scm/browsers/FishEyeSVN.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.kohsuke.stapler.DataBoundConstructor;
3737
import org.kohsuke.stapler.QueryParameter;
3838

39-
import javax.servlet.ServletException;
4039
import java.io.IOException;
4140
import java.net.MalformedURLException;
4241
import java.net.URL;
@@ -132,7 +131,7 @@ public String getDisplayName() {
132131
* Performs on-the-fly validation of the URL.
133132
*/
134133
@RequirePOST
135-
public FormValidation doCheckUrl(@QueryParameter(fixEmpty=true) String value) throws IOException, ServletException {
134+
public FormValidation doCheckUrl(@QueryParameter(fixEmpty=true) String value) throws IOException {
136135
if(value==null) // nothing entered yet
137136
return FormValidation.ok();
138137

@@ -147,7 +146,7 @@ public FormValidation doCheckUrl(@QueryParameter(fixEmpty=true) String value) th
147146
final String finalValue = value;
148147
return new URLCheck() {
149148
@Override
150-
protected FormValidation check() throws IOException, ServletException {
149+
protected FormValidation check() throws IOException {
151150
try {
152151
if(findText(open(new URL(finalValue)),"FishEye")) {
153152
return FormValidation.ok();

‎src/main/java/hudson/scm/browsers/Sventon.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.kohsuke.stapler.DataBoundConstructor;
3737
import org.kohsuke.stapler.QueryParameter;
3838

39-
import javax.servlet.ServletException;
4039
import java.io.IOException;
4140
import java.net.MalformedURLException;
4241
import java.net.URL;
@@ -101,7 +100,7 @@ public String getDisplayName() {
101100
@RequirePOST
102101
public FormValidation doCheckUrl(@AncestorInPath Item project,
103102
@QueryParameter(fixEmpty=true) final String value)
104-
throws IOException, ServletException {
103+
throws IOException {
105104
if (project == null && !Jenkins.get().hasPermission(Jenkins.ADMINISTER) ||
106105
project != null && !project.hasPermission(Item.EXTENDED_READ)) {
107106
return FormValidation.ok();
@@ -110,7 +109,7 @@ public FormValidation doCheckUrl(@AncestorInPath Item project,
110109
return FormValidation.ok();
111110

112111
return new URLCheck() {
113-
protected FormValidation check() throws IOException, ServletException {
112+
protected FormValidation check() throws IOException {
114113
String v = value;
115114
if(!v.endsWith("/")) v+='/';
116115

‎src/main/java/hudson/scm/browsers/Sventon2.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.kohsuke.stapler.DataBoundConstructor;
3737
import org.kohsuke.stapler.QueryParameter;
3838

39-
import javax.servlet.ServletException;
4039
import java.io.IOException;
4140
import java.io.UnsupportedEncodingException;
4241
import java.net.MalformedURLException;
@@ -121,7 +120,7 @@ public String getDisplayName() {
121120
@RequirePOST
122121
public FormValidation doCheckUrl(@AncestorInPath Item project,
123122
@QueryParameter(fixEmpty=true) final String value)
124-
throws IOException, ServletException {
123+
throws IOException {
125124
if (project == null && !Jenkins.get().hasPermission(Jenkins.ADMINISTER) ||
126125
project != null && !project.hasPermission(Item.EXTENDED_READ)) {
127126
return FormValidation.ok();
@@ -130,7 +129,7 @@ public FormValidation doCheckUrl(@AncestorInPath Item project,
130129
return FormValidation.ok();
131130

132131
return new URLCheck() {
133-
protected FormValidation check() throws IOException, ServletException {
132+
protected FormValidation check() throws IOException {
134133
String v = value;
135134
if(!v.endsWith("/")) v+='/';
136135

‎src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.kohsuke.stapler.AncestorInPath;
6161
import org.kohsuke.stapler.DataBoundConstructor;
6262
import org.kohsuke.stapler.QueryParameter;
63-
import org.kohsuke.stapler.StaplerRequest;
63+
import org.kohsuke.stapler.StaplerRequest2;
6464
import org.kohsuke.stapler.interceptor.RequirePOST;
6565
import org.tmatesoft.svn.core.SVNDepth;
6666
import org.tmatesoft.svn.core.SVNDirEntry;
@@ -126,7 +126,7 @@ public ListSubversionTagsParameterDefinition(String name, String tagsDir, String
126126

127127
// This method is invoked from a GET or POST HTTP request
128128
@Override
129-
public ParameterValue createValue(StaplerRequest req) {
129+
public ParameterValue createValue(StaplerRequest2 req) {
130130
String[] values = req.getParameterValues(getName());
131131
if(values == null || values.length != 1) {
132132
return this.getDefaultParameterValue();
@@ -138,7 +138,7 @@ public ParameterValue createValue(StaplerRequest req) {
138138

139139
// This method is invoked when the user clicks on the "Build" button of Hudon's GUI
140140
@Override
141-
public ParameterValue createValue(StaplerRequest req, JSONObject formData) {
141+
public ParameterValue createValue(StaplerRequest2 req, JSONObject formData) {
142142
ListSubversionTagsParameterValue value = req.bindJSON(ListSubversionTagsParameterValue.class, formData);
143143
value.setTagsDir(getTagsDir());
144144
// here, we could have checked for the value of the "tag" attribute of the
@@ -379,7 +379,7 @@ public ISVNAuthenticationProvider createAuthenticationProvider(AbstractProject c
379379

380380
@CheckForNull
381381
@RequirePOST
382-
public FormValidation doCheckTagsDir(StaplerRequest req, @AncestorInPath Item context, @QueryParameter String value) {
382+
public FormValidation doCheckTagsDir(StaplerRequest2 req, @AncestorInPath Item context, @QueryParameter String value) {
383383
Jenkins instance = Jenkins.getInstance();
384384
if (instance != null) {
385385
SubversionSCM.ModuleLocation.DescriptorImpl desc = instance.getDescriptorByType(SubversionSCM.ModuleLocation.DescriptorImpl.class);
@@ -401,7 +401,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item context, @Quer
401401

402402
// used from config.jelly
403403
@RequirePOST
404-
public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath Item context, @QueryParameter String tagsDir, @QueryParameter String value) {
404+
public FormValidation doCheckCredentialsId(StaplerRequest2 req, @AncestorInPath Item context, @QueryParameter String tagsDir, @QueryParameter String value) {
405405
if (context == null || !context.hasPermission(CredentialsProvider.USE_ITEM)) {
406406
return FormValidation.ok();
407407
}

‎src/main/java/jenkins/scm/impl/subversion/SubversionSCMSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import org.kohsuke.stapler.AncestorInPath;
7474
import org.kohsuke.stapler.DataBoundConstructor;
7575
import org.kohsuke.stapler.QueryParameter;
76-
import org.kohsuke.stapler.StaplerRequest;
76+
import org.kohsuke.stapler.StaplerRequest2;
7777
import org.tmatesoft.svn.core.SVNDirEntry;
7878
import org.tmatesoft.svn.core.SVNException;
7979
import org.tmatesoft.svn.core.SVNNodeKind;
@@ -861,7 +861,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item context,
861861
* validate the value for a remote (repository) location.
862862
*/
863863
@RequirePOST
864-
public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath Item context, @QueryParameter String remoteBase, @QueryParameter String value) {
864+
public FormValidation doCheckCredentialsId(StaplerRequest2 req, @AncestorInPath Item context, @QueryParameter String remoteBase, @QueryParameter String value) {
865865
// TODO suspiciously similar to SubversionSCM.ModuleLocation.DescriptorImpl.checkCredentialsId; refactor into shared method?
866866
// Test the connection only if we may use the credentials
867867
if (context == null && !Jenkins.get().hasPermission(Jenkins.ADMINISTER) ||

‎src/test/java/hudson/scm/AbstractSubversionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static org.mockito.Mockito.when;
1111
import net.sf.json.JSONObject;
1212

13-
import org.kohsuke.stapler.StaplerRequest;
13+
import org.kohsuke.stapler.StaplerRequest2;
1414

1515
import java.io.File;
1616
import java.io.IOException;
@@ -48,7 +48,7 @@ public abstract class AbstractSubversionTest {
4848
* @param format one of the WC constants form SVNAdminAreaFactory or SubversionWorkspaceSelector.WC_FORMAT_17
4949
*/
5050
protected void configureSvnWorkspaceFormat(int format) throws Exception {
51-
StaplerRequest req = mock(StaplerRequest.class);
51+
StaplerRequest2 req = mock(StaplerRequest2.class);
5252
when(req.getParameter("svn.workspaceFormat")).thenReturn(""+format);
5353

5454
JSONObject formData = new JSONObject();

‎src/test/java/hudson/scm/SubversionRepositoryStatusTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Set;
1313
import java.util.UUID;
1414

15-
import javax.servlet.ServletException;
15+
import jakarta.servlet.ServletException;
1616

1717
import org.junit.Test;
1818
import org.junit.Assert;

0 commit comments

Comments
 (0)