From 49631827e16d8151d99faa116603e6411df520ad Mon Sep 17 00:00:00 2001
From: mahabaleshwars <mahabaleshwar.s@infosys.com>
Date: Fri, 8 Mar 2024 12:12:42 +0530
Subject: [PATCH] updated regex to match the new version file format

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

diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 2a69d4e..980338f 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -87891,11 +87891,13 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(\S+)/m;
+        javaVersionRegExp =
+            /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
         core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
     }
     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 b94e2f9..e9da8b2 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -125265,11 +125265,13 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     var _a, _b, _c, _d, _e;
     let javaVersionRegExp;
     if (versionFile == '.tool-versions') {
-        javaVersionRegExp = /^java\s+(\S+)/m;
+        javaVersionRegExp =
+            /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
         core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
     }
     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 52248d9..3f8680d 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -120,10 +120,12 @@ export function getVersionFromFileContent(
 ): string | null {
   let javaVersionRegExp: RegExp;
   if (versionFile == '.tool-versions') {
-    javaVersionRegExp = /^java\s+(\S+)/m;
+    javaVersionRegExp =
+      /^java\s+(?:\S+-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m;
     core.info(`Using .tool-versions file regx: ${javaVersionRegExp}`);
   } 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');
   }