fix: remove JavaProvider (#541)

* fix: remove JavaProvider * Update revision and compatibleSinceVersion in pom.xml
jenkinsci · Dec 23, 2024 · acc11bd · acc11bd
1 parent 7f9ef72
commit acc11bd
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 394 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,11 +25,11 @@
   </licenses>
 
   <properties>
-    <revision>2</revision>
+    <revision>3</revision>
     <changelist>999999-SNAPSHOT</changelist>
     <jenkins.baseline>2.479</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
-    <hpi.compatibleSinceVersion>2.0.0</hpi.compatibleSinceVersion>
+    <hpi.compatibleSinceVersion>3.0.0</hpi.compatibleSinceVersion>
   </properties>
 
   <developers>

diff --git a/src/main/java/hudson/plugins/sshslaves/DefaultJavaProvider.java b/src/main/java/hudson/plugins/sshslaves/DefaultJavaProvider.java
diff --git a/src/main/java/hudson/plugins/sshslaves/JavaProvider.java b/src/main/java/hudson/plugins/sshslaves/JavaProvider.java
diff --git a/src/main/java/hudson/plugins/sshslaves/JavaVersionChecker.java b/src/main/java/hudson/plugins/sshslaves/JavaVersionChecker.java
diff --git a/src/main/java/hudson/plugins/sshslaves/SSHLauncher.java b/src/main/java/hudson/plugins/sshslaves/SSHLauncher.java
@@ -448,15 +448,9 @@ public void launch(final SlaveComputer computer, final TaskListener listener) th
                         return Boolean.FALSE;
                     }
 
-                    String java = null;
+                    String java = "java";
                     if (StringUtils.isNotBlank(javaPath)) {
-                        java = expandExpression(computer, javaPath);
-                    } else {
-                      checkJavaIsInPath(listener);
-                      //FIXME deprecated on 2020-12-10, it will removed after 2021-09-01
-                        JavaVersionChecker javaVersionChecker = new JavaVersionChecker(computer, listener, getJvmOptions(),
-                                connection);
-                        java = javaVersionChecker.resolveJava();
+                      java = expandExpression(computer, javaPath);
                     }
 
                     copyAgentJar(listener, workingDirectory);