Skip to content

Commit acc11bd

Browse files
fix: remove JavaProvider (#541)
* fix: remove JavaProvider * Update revision and compatibleSinceVersion in pom.xml
1 parent 7f9ef72 commit acc11bd

File tree

6 files changed

+4
-394
lines changed

6 files changed

+4
-394
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
</licenses>
2626

2727
<properties>
28-
<revision>2</revision>
28+
<revision>3</revision>
2929
<changelist>999999-SNAPSHOT</changelist>
3030
<jenkins.baseline>2.479</jenkins.baseline>
3131
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
32-
<hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
32+
<hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
3333
</properties>
3434

3535
<developers>

src/main/java/hudson/plugins/sshslaves/DefaultJavaProvider.java

-123
This file was deleted.

src/main/java/hudson/plugins/sshslaves/JavaProvider.java

-80
This file was deleted.

src/main/java/hudson/plugins/sshslaves/JavaVersionChecker.java

-149
This file was deleted.

src/main/java/hudson/plugins/sshslaves/SSHLauncher.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,9 @@ public void launch(final SlaveComputer computer, final TaskListener listener) th
448448
return Boolean.FALSE;
449449
}
450450

451-
String java = null;
451+
String java = "java";
452452
if (StringUtils.isNotBlank(javaPath)) {
453-
java = expandExpression(computer, javaPath);
454-
} else {
455-
checkJavaIsInPath(listener);
456-
//FIXME deprecated on 2020-12-10, it will removed after 2021-09-01
457-
JavaVersionChecker javaVersionChecker = new JavaVersionChecker(computer, listener, getJvmOptions(),
458-
connection);
459-
java = javaVersionChecker.resolveJava();
453+
java = expandExpression(computer, javaPath);
460454
}
461455

462456
copyAgentJar(listener, workingDirectory);

0 commit comments

Comments
 (0)