From 3a444404592ebfe47b2e1ec60c8cb9b5d146e260 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 15:52:28 +0530
Subject: [PATCH] regex modified

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

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 654cf8d7..d0380eb1 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87891,7 +87891,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s(?<version>(\d+(-ea)?))(\s|$)/;
+        javaVersionRegExp =
+            /^(java\s+)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 59629a68..432e57ad 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125265,7 +125265,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s(?<version>(\d+(-ea)?))(\s|$)/;
+        javaVersionRegExp =
+            /^(java\s+)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/src/util.ts b/src/util.ts
index 9da5370a..b0d79877 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -120,7 +120,8 @@ export function getVersionFromFileContent(
 ): string | null {
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
-    javaVersionRegExp = /^java\s(?<version>(\d+(-ea)?))(\s|$)/;
+    javaVersionRegExp =
+      /^(java\s+)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {