Merge pull request #235 from basil/refresh

Require 2.479.1 or newer

Author: alecharp

pom.xml

@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.7</version>
     <relativePath />
   </parent>
 
@@ -72,8 +72,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.440</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
 
@@ -95,11 +95,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-	<!-- Last 2.426.x BOM version before a trilead api upgrade -->
-	<!-- Trilead API upgrade breaks plugin compatibility tests due to poor handling of optional dependencies -->
-	<!-- Do not change this without checking plugin BOM passes with new version -->
-	<!-- https://github.com/jenkinsci/bom/pull/3404 -->
-        <version>3234.v5ca_5154341ef</version>
+        <version>3893.v213a_42768d35</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPassword.java

@@ -29,6 +29,7 @@
 import com.cloudbees.plugins.credentials.ResolveWith;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.Descriptor;
 import hudson.util.Secret;
 
 /**
@@ -75,7 +76,12 @@ public Secret getPassword() {
 
     @Override
     protected Object readResolve() {
-        UsernamePasswordCredentialsImpl resolved = new UsernamePasswordCredentialsImpl(getScope(), getId(), getDescription(), getUsername(), getPassword().getEncryptedValue());
+        UsernamePasswordCredentialsImpl resolved;
+        try {
+            resolved = new UsernamePasswordCredentialsImpl(getScope(), getId(), getDescription(), getUsername(), getPassword().getEncryptedValue());
+        } catch (Descriptor.FormException e) {
+            throw new RuntimeException(e);
+        }
         resolved.setUsernameSecret(true);
         return resolved;
     }