From 0bd564a691b3fe66c584b321ac9e1be828b8e73e Mon Sep 17 00:00:00 2001 From: mahabaleshwars Date: Fri, 8 Mar 2024 12:42:45 +0530 Subject: [PATCH] changed the regex --- dist/cleanup/index.js | 3 +-- dist/setup/index.js | 3 +-- src/util.ts | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 03b4b5f7..f09c0b50 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -87891,8 +87891,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = - /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\.\d+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/dist/setup/index.js b/dist/setup/index.js index bf40a1ca..5138fc26 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125265,8 +125265,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { var _a, _b, _c, _d, _e; let javaVersionRegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = - /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\.\d+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; diff --git a/src/util.ts b/src/util.ts index f8f9a907..fa2fa02f 100644 --- a/src/util.ts +++ b/src/util.ts @@ -120,8 +120,7 @@ export function getVersionFromFileContent( ): string | null { let javaVersionRegExp: RegExp; if (versionFile == '.tool-versions') { - javaVersionRegExp = - /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + javaVersionRegExp = /^java\s+(?:\S+-)?v?((\d+)(\.\d+)?(\.\d+)?(\.\d+)?(\+\d+)?(-ea)?(\.\d+)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {