diff --git a/Jenkinsfile b/Jenkinsfile
index a7a037f9..a229fa51 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(jenkinsVersions: [null, '2.32.3'])
+buildPlugin()
diff --git a/pom.xml b/pom.xml
index 23d864f4..a5930e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
1.31
-SNAPSHOT
- 2.7.3
- 7
+ 2.150.1
+ 8
false
@@ -56,8 +56,17 @@
org.jenkins-ci.plugins
ssh-slaves
- 1.25
+ 1.30.0
test
+
+
+
+ org.jenkins-ci
+ symbol-annotation
+ 1.7
+
+
+
diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java
index d446de5f..94879116 100644
--- a/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java
+++ b/src/test/java/org/jenkinsci/plugins/durabletask/BourneShellScriptTest.java
@@ -24,6 +24,11 @@
package org.jenkinsci.plugins.durabletask;
+import com.cloudbees.plugins.credentials.Credentials;
+import com.cloudbees.plugins.credentials.CredentialsScope;
+import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
+import com.cloudbees.plugins.credentials.domains.Domain;
+import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import hudson.EnvVars;
import hudson.FilePath;
import hudson.Launcher;
@@ -318,7 +323,10 @@ private void awaitCompletion(Controller c) throws IOException, InterruptedExcept
}
private DumbSlave createDockerSlave(DockerContainer container, String javaPath) throws hudson.model.Descriptor.FormException, IOException {
- return new DumbSlave("docker", "/home/test", new SSHLauncher(container.ipBound(22), container.port(22), "test", "test", "", "", javaPath, null, null));
+ SystemCredentialsProvider.getInstance().setDomainCredentialsMap(Collections.singletonMap(Domain.global(), Collections.singletonList(new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "test", null, "test", "test"))));
+ SSHLauncher sshLauncher = new SSHLauncher(container.ipBound(22), container.port(22), "test");
+ sshLauncher.setJavaPath(javaPath);
+ return new DumbSlave("docker", "/home/test", sshLauncher);
}
private void runOnDocker(DumbSlave s) throws Exception {
diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java
index df4b9f87..a05230bd 100644
--- a/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java
+++ b/src/test/java/org/jenkinsci/plugins/durabletask/EncodingTest.java
@@ -24,6 +24,11 @@
package org.jenkinsci.plugins.durabletask;
+import com.cloudbees.plugins.credentials.Credentials;
+import com.cloudbees.plugins.credentials.CredentialsScope;
+import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
+import com.cloudbees.plugins.credentials.domains.Domain;
+import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import hudson.EnvVars;
import hudson.FilePath;
import hudson.Launcher;
@@ -35,6 +40,7 @@
import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.BlockingQueue;
@@ -80,7 +86,10 @@ public class EncodingTest {
listener = StreamTaskListener.fromStdout();
launcher = r.jenkins.createLauncher(listener);
JavaContainer container = dockerUbuntu.create();
- s = new DumbSlave("docker", "/home/test", new SSHLauncher(container.ipBound(22), container.port(22), "test", "test", "", "-Dfile.encoding=ISO-8859-1"));
+ SystemCredentialsProvider.getInstance().setDomainCredentialsMap(Collections.singletonMap(Domain.global(), Collections.singletonList(new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "test", null, "test", "test"))));
+ SSHLauncher sshLauncher = new SSHLauncher(container.ipBound(22), container.port(22), "test");
+ sshLauncher.setJvmOptions("-Dfile.encoding=ISO-8859-1");
+ s = new DumbSlave("docker", "/home/test", sshLauncher);
r.jenkins.addNode(s);
r.waitOnline(s);
assertEquals("ISO-8859-1", s.getChannel().call(new DetectCharset()));