Merge cb386ac736 into b8ebb8ba1d

Regex update
2026-07-12 00:55:39 +00:00 · 2025-03-21 07:12:06 +00:00 · 2025-03-21 12:42:01 +05:30
3 changed files with 3 additions and 3 deletions
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@ -94229,7 +94229,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@ -132234,7 +132234,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
    const versionFileName = getFileName(versionFile);
    if (versionFileName == '.tool-versions') {
        javaVersionRegExp =
-            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+            /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
    }
    else {
        javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
--- a/src/util.ts
+++ b/src/util.ts
@ -133,7 +133,7 @@ export function getVersionFromFileContent(
  const versionFileName = getFileName(versionFile);
  if (versionFileName == '.tool-versions') {
    javaVersionRegExp =
-      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
+      /^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\S+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
  } else {
    javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
  }
Author	SHA1	Message	Date
aparnajyothi-y	80ad891cd8	Merge `cb386ac736` into `b8ebb8ba1d`	2025-03-21 07:12:06 +00:00
Aparna Jyothi	cb386ac736	Regex update	2025-03-21 12:42:01 +05:30