From 5633ed7ce0e061239174404acd1b2d7ba40ee1df Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 12:26:41 +0530
Subject: [PATCH] new 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 980338fc..03b4b5f7 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87892,12 +87892,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
-        core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
+            /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-        core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
     }
     else {
         throw new Error('Invalid version file');
diff --git a/dist/setup/index.js b/dist/setup/index.js
index e9da8b21..bf40a1ca 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125266,12 +125266,10 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
         javaVersionRegExp =
-            /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
-        core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
+            /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     }
     else if (versionFile == '.java-version') {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-        core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
     }
     else {
         throw new Error('Invalid version file');
diff --git a/src/util.ts b/src/util.ts
index 3f8680d9..f8f9a907 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -121,11 +121,9 @@ export function getVersionFromFileContent(
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
     javaVersionRegExp =
-      /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
-    core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
+      /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
   } else if (versionFile == '.java-version') {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
-    core.info(`Using .java-version file regx: ${javaVersionRegExp}`);
   } else {
     throw new Error('Invalid version file');
   }