From b626662f5f1f5665ea652769147ace8bbd0077e5 Mon Sep 17 00:00:00 2001 From: Valentin Delaye Date: Fri, 16 Jan 2026 11:07:01 +0100 Subject: [PATCH] Refresh for January 2026 --- pom.xml | 23 ++++++++----------- .../hudson/plugins/CredentialsSSHSite.java | 3 ++- .../jvnet/hudson/plugins/SSHBuildWrapper.java | 12 ++++------ .../org/jvnet/hudson/plugins/SSHBuilder.java | 4 ++-- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 254c57e..b2bf517 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.88 + 6.2116.v7501b_67dc517 @@ -15,17 +15,6 @@ Execute shell scripts on remote host using ssh (pre and post build). Based on the cool scp plugin. https://github.com/jenkinsci/${project.artifactId}-plugin - - - edmund_wagner - Edmund Wagner - - - ljader - Lukasz Jader - - - scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git @@ -46,10 +35,12 @@ 999999-SNAPSHOT - 2.426 + + 2.516 ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin false + false @@ -57,7 +48,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 3208.vb_21177d4b_cd9 + 5888.vd99c2b_38128d pom import @@ -65,6 +56,10 @@ + + io.jenkins.plugins + commons-lang3-api + org.jenkins-ci.plugins jsch diff --git a/src/main/java/org/jvnet/hudson/plugins/CredentialsSSHSite.java b/src/main/java/org/jvnet/hudson/plugins/CredentialsSSHSite.java index 6062efc..56a3ac6 100755 --- a/src/main/java/org/jvnet/hudson/plugins/CredentialsSSHSite.java +++ b/src/main/java/org/jvnet/hudson/plugins/CredentialsSSHSite.java @@ -20,6 +20,7 @@ import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; +import hudson.model.Descriptor.FormException; import hudson.model.Item; import hudson.security.ACL; import hudson.util.StreamTaskListener; @@ -139,7 +140,7 @@ private Session createSession(final PrintStream logger) throws JSchException, IO * Returns the same instance when supplied with CredentialsSSHSite */ public static CredentialsSSHSite migrateToCredentials(CredentialsSSHSite site) - throws InterruptedException, IOException { + throws InterruptedException, IOException, FormException { if (!(site instanceof LegacySSHSite)) { return site; } diff --git a/src/main/java/org/jvnet/hudson/plugins/SSHBuildWrapper.java b/src/main/java/org/jvnet/hudson/plugins/SSHBuildWrapper.java index 0af635b..8525c95 100644 --- a/src/main/java/org/jvnet/hudson/plugins/SSHBuildWrapper.java +++ b/src/main/java/org/jvnet/hudson/plugins/SSHBuildWrapper.java @@ -35,13 +35,13 @@ import java.util.logging.Logger; import jenkins.model.Jenkins; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jenkinsci.plugins.jsch.JSchConnector; import org.kohsuke.stapler.AncestorInPath; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; public final class SSHBuildWrapper extends BuildWrapper { @@ -217,7 +217,7 @@ public String getHelpFile() { @SuppressFBWarnings( value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", justification = "Javadoc promises req is always non-null") - public BuildWrapper newInstance(StaplerRequest req, JSONObject formData) { + public BuildWrapper newInstance(StaplerRequest2 req, JSONObject formData) { return req.bindJSON(clazz, formData); } @@ -240,7 +240,7 @@ public FormValidation doCheckCredentialId(@QueryParameter("credentialId") String } @Override - public boolean configure(StaplerRequest req, JSONObject formData) { + public boolean configure(StaplerRequest2 req, JSONObject formData) { List sitesFromRequest = req.bindJSONToList(CredentialsSSHSite.class, formData.get("sites")); for (Iterator iter = sitesFromRequest.iterator(); iter.hasNext(); ) { @@ -328,9 +328,7 @@ private Object readResolve() { migratedCredentials.add(migrated); madeChanges = madeChanges || (migrated != site); - } catch (InterruptedException e) { - throw new IllegalStateException("Failed to migrate site: " + site, e); - } catch (IOException e) { + } catch (InterruptedException | IOException | FormException e) { throw new IllegalStateException("Failed to migrate site: " + site, e); } } diff --git a/src/main/java/org/jvnet/hudson/plugins/SSHBuilder.java b/src/main/java/org/jvnet/hudson/plugins/SSHBuilder.java index b0d1583..297336a 100755 --- a/src/main/java/org/jvnet/hudson/plugins/SSHBuilder.java +++ b/src/main/java/org/jvnet/hudson/plugins/SSHBuilder.java @@ -17,7 +17,7 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; public class SSHBuilder extends Builder { @@ -129,7 +129,7 @@ public String getDisplayName() { } @Override - public Builder newInstance(StaplerRequest req, JSONObject formData) + public Builder newInstance(StaplerRequest2 req, JSONObject formData) throws hudson.model.Descriptor.FormException { return req.bindJSON(clazz, formData); }