Merge branch 'v3.x/staging' into reboot/fix/defaults-infinispan

zowe · Jan 29, 2025 · 00a7a21 · 00a7a21
2 parents ff9bc84 + 269f2d7
commit 00a7a21
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bin/libs/java.ts b/bin/libs/java.ts
@@ -102,8 +102,9 @@ export function validateJavaHome(javaHome:string|undefined=std.getenv("JAVA_HOME
     let versionLines = (version as string).split('\n'); // valid because of above rc check
     for (let i = 0; i < versionLines.length; i++) {
       if ((index = versionLines[i].indexOf('java version')) != -1) {
-        //format of: java version "1.8.0_321"
-        javaVersionShort=versionLines[i].substring(index+('java version'.length)+2, versionLines[i].length-1);
+        //format of: java version "1.8.0_321" OR java version "17.0.10" 2024-01-02
+        javaVersionShort = versionLines[i].substring(index+('java version'.length)+2);
+        javaVersionShort = javaVersionShort.replace(/"/g, '');
         break;
       } else if ((index = versionLines[i].indexOf('openjdk version')) != -1) {
         javaVersionShort=versionLines[i].substring(index+('openjdk version'.length)+2, versionLines[i].length-1);