From 600bab6918ba186f9b9f9156fa47c0af30929d1f Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 11:07:49 +0530
Subject: [PATCH] updated the regex

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

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index c21417ca..7c55c16d 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87891,12 +87891,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
-        core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
+        javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-        core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
     }
     else {
         throw new Error('Invalid version file');
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 97687848..a0b1fd3e 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125265,12 +125265,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
-        core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
+        javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-        core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
     }
     else {
         throw new Error('Invalid version file');
diff --git a/src/util.ts b/src/util.ts
index fb2b2a61..2a17aca9 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -120,11 +120,9 @@ export function getVersionFromFileContent(
 ): string | null {
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
-    javaVersionRegExp = /^java\s+(?:\S+-)?v?(?<version>[^\s-]+(?:-\S+)?)$/m;
-    core.info(`Tool version javaVersionRegExp: ${javaVersionRegExp}`);
+    javaVersionRegExp = /^java\s\d+(-\w+)?(\.\d+)*$/m;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-    core.info(`java version javaVersionRegExp: ${javaVersionRegExp}`);
   } else {
     throw new Error('Invalid version file');
   }