From ac5ac98c3775cba766f96a742853cf3ef28bf736 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 12:56:45 +0530
Subject: [PATCH] used java version regex

---
 dist/cleanup/index.js | 2 +-
 dist/setup/index.js   | 2 +-
 src/util.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index c7204e6a..6d68e3c6 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87891,7 +87891,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\d*)?)$/m;
+        javaVersionRegExp = /^java\s(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 10d52948..69e991dc 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125265,7 +125265,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\d*)?)$/m;
+        javaVersionRegExp = /^java\s(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/src/util.ts b/src/util.ts
index 6f2ff6eb..15dcbdd9 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -120,7 +120,7 @@ export function getVersionFromFileContent(
 ): string | null {
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
-    javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\d*)?)$/m;
+    javaVersionRegExp = /^java\s(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {