Skip to content

Commit fec9ccb

Browse files
authored
Migrate from EE 8 to EE 9 (#371)
1 parent 5dfecc3 commit fec9ccb

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>4.74</version>
31+
<version>5.5</version>
3232
<relativePath />
3333
</parent>
3434

3535
<properties>
3636
<changelist>999999-SNAPSHOT</changelist>
3737
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3838
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
39-
<jenkins.baseline>2.361</jenkins.baseline>
40-
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
39+
<jenkins.baseline>2.479</jenkins.baseline>
40+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
4141
</properties>
4242

4343
<artifactId>publish-over-ssh</artifactId>
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>io.jenkins.tools.bom</groupId>
7171
<artifactId>bom-${jenkins.baseline}.x</artifactId>
72-
<version>2102.v854b_fec19c92</version>
72+
<version>3850.vb_c5319efa_e29</version>
7373
<scope>import</scope>
7474
<type>pom</type>
7575
</dependency>

src/main/java/jenkins/plugins/publish_over_ssh/BapSshTransferCache.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.core.type.TypeReference;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
56
import hudson.FilePath;
67
import hudson.remoting.VirtualChannel;
78
import org.jenkinsci.remoting.RoleChecker;
@@ -124,6 +125,7 @@ public BapSshTransferCacheRow() {}
124125
*
125126
* @param fileRef
126127
*/
128+
@SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
127129
public BapSshTransferCacheRow(File fileRef) {
128130
HashValue = getHashValue(fileRef);
129131
try {

src/main/java/jenkins/plugins/publish_over_ssh/descriptor/BapSshCredentialsDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public FormValidation doCheckUsername(@QueryParameter final String value) {
5858
}
5959

6060
public FormValidation doCheckKeyPath(@QueryParameter final String value) {
61-
AccessControlled subject = Stapler.getCurrentRequest().findAncestorObject(AbstractProject.class);
61+
AccessControlled subject = Stapler.getCurrentRequest2().findAncestorObject(AbstractProject.class);
6262
if (subject == null) {
6363
subject = Jenkins.getInstance();
6464
}

src/main/java/jenkins/plugins/publish_over_ssh/descriptor/BapSshHostConfigurationDescriptor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import jenkins.plugins.publish_over_ssh.BapSshPublisherPlugin;
3434
import jenkins.plugins.publish_over_ssh.Messages;
3535
import org.kohsuke.stapler.QueryParameter;
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
import org.kohsuke.stapler.interceptor.RequirePOST;
3939

4040
@Extension
@@ -92,7 +92,7 @@ public FormValidation doCheckKeyPath(@QueryParameter final String value) {
9292
}
9393

9494
@RequirePOST
95-
public FormValidation doTestConnection(final StaplerRequest request, final StaplerResponse response) {
95+
public FormValidation doTestConnection(final StaplerRequest2 request, final StaplerResponse2 response) {
9696
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
9797

9898
final BapSshPublisherPlugin.Descriptor pluginDescriptor;

src/main/java/jenkins/plugins/publish_over_ssh/descriptor/BapSshPublisherPluginDescriptor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import hudson.util.Secret;
3737
import jenkins.plugins.publish_over.BPHostConfiguration;
3838
import org.apache.commons.lang.StringUtils;
39-
import org.kohsuke.stapler.StaplerRequest;
40-
import org.kohsuke.stapler.StaplerResponse;
39+
import org.kohsuke.stapler.StaplerRequest2;
40+
import org.kohsuke.stapler.StaplerResponse2;
4141

4242
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
4343
import hudson.Util;
@@ -145,7 +145,7 @@ public void removeHostConfiguration(final String name) {
145145
}
146146

147147
@Override
148-
public boolean configure(final StaplerRequest request, final JSONObject formData) {
148+
public boolean configure(final StaplerRequest2 request, final JSONObject formData) {
149149
final List<BapSshHostConfiguration> newConfigurations = request.bindJSONToList(BapSshHostConfiguration.class,
150150
formData.get("instance"));
151151
commonConfig = request.bindJSON(BapSshCommonConfiguration.class, formData.getJSONObject("commonConfig"));
@@ -192,7 +192,7 @@ public jenkins.plugins.publish_over.view_defaults.manage_jenkins.Messages getCom
192192
}
193193

194194
@RequirePOST
195-
public FormValidation doTestConnection(final StaplerRequest request, final StaplerResponse response) {
195+
public FormValidation doTestConnection(final StaplerRequest2 request, final StaplerResponse2 response) {
196196
Jenkins.get().checkPermission(Jenkins.ADMINISTER);
197197
final BapSshHostConfiguration hostConfig = request.bindParameters(BapSshHostConfiguration.class, "");
198198
hostConfig.setCommonConfig(request.bindParameters(BapSshCommonConfiguration.class, "common."));

0 commit comments

Comments
 (0)