From cda1881001f26509d30a9fff553b0eb573c94929 Mon Sep 17 00:00:00 2001
From: Aparna Jyothi <aparnajyothi-y@github.com>
Date: Fri, 16 May 2025 14:50:16 +0530
Subject: [PATCH] regex update for all the versions

---
 .github/workflows/publish-immutable-actions.yml | 2 +-
 dist/cleanup/index.js                           | 3 ++-
 dist/setup/index.js                             | 3 ++-
 src/util.ts                                     | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml
index 34c50f55..ca458fbd 100644
--- a/.github/workflows/publish-immutable-actions.yml
+++ b/.github/workflows/publish-immutable-actions.yml
@@ -4,7 +4,7 @@ on:
   release:
     types: [released]
   workflow_dispatch:
-    
+
 jobs:
   publish:
     runs-on: ubuntu-latest
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
index 0896c47e..4e769151 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -93633,7 +93633,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     }
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
-        javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
+        javaVersionRegExp =
+            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*)(?:(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*)(?:\+\S+)?$/im;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/dist/setup/index.js b/dist/setup/index.js
index a0606256..5d80b21f 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -131638,7 +131638,8 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     }
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
-        javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
+        javaVersionRegExp =
+            /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*)(?:(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*)(?:\+\S+)?$/im;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/src/util.ts b/src/util.ts
index e230e605..39f9d251 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -132,7 +132,8 @@ export function getVersionFromFileContent(
 
   const versionFileName = getFileName(versionFile);
   if (versionFileName == '.tool-versions') {
-    javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
+    javaVersionRegExp =
+      /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*)(?:(?:[-_.](?:ea|LTS|beta|snapshot|internal|b\d+|\d+[a-z]*))*)(?:\+\S+)?$/im;
   } else {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   }