From 88a3812f0e32c4d7ca2b8e84531d742ab81272bc Mon Sep 17 00:00:00 2001
From: Aparna Jyothi <aparnajyothi-y@github.com>
Date: Mon, 5 May 2025 17:31:43 +0530
Subject: [PATCH] updated regex

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

diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml
index 758634c7..34c50f55 100644
--- a/.github/workflows/publish-immutable-actions.yml
+++ b/.github/workflows/publish-immutable-actions.yml
@@ -4,8 +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 035c1419..0896c47e 100644
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@@ -93633,8 +93633,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     }
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
-        javaVersionRegExp =
-            /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
+        javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/dist/setup/index.js b/dist/setup/index.js
index 1e015abb..a0606256 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -131638,8 +131638,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
     }
     const versionFileName = getFileName(versionFile);
     if (versionFileName == '.tool-versions') {
-        javaVersionRegExp =
-            /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
+        javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
     }
     else {
         javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
diff --git a/src/util.ts b/src/util.ts
index 8057e980..e230e605 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -132,8 +132,7 @@ export function getVersionFromFileContent(
 
   const versionFileName = getFileName(versionFile);
   if (versionFileName == '.tool-versions') {
-    javaVersionRegExp =
-      /^java\s+(?<distribution>[a-zA-Z0-9.-]+)-(?<version>[a-zA-Z0-9._+\-]+(?:[-][a-zA-Z0-9._+\-]*)*)$/m;
+    javaVersionRegExp = /^java\s+\S+?-([0-9a-zA-Z.+-]+(?:[0-9a-zA-Z.-]+)?)$/m;
   } else {
     javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
   }