From 4ef246eff9194efd4ff6d4bc45848ba9e5461803 Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 16:38:03 +0530
Subject: [PATCH] regex updated

---
 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 1f608d15..551e36a8 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87892,7 +87892,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S+-)v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^(java\s+)(?:\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 60fa6ec4..70a5135f 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125266,7 +125266,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^(java\s+)(?:\S+-)v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+            /^(java\s+)(?:\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 8505df1b..2789ee5c 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -121,7 +121,7 @@ export function getVersionFromFileContent(
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
     javaVersionRegExp =
-      /^(java\s+)(?:\S+-)v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
+      /^(java\s+)(?:\S+-?)v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   } else {