diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index d0380eb..1f608d1 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -87892,7 +87892,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { let javaVersionRegExp; if (versionFile == '.tool-versions') { javaVersionRegExp = - /^(java\s+)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S+-)v?(?(\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 432e57a..60fa6ec 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -125266,7 +125266,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) { let javaVersionRegExp; if (versionFile == '.tool-versions') { javaVersionRegExp = - /^(java\s+)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S+-)v?(?(\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 b0d7987..8505df1 100644 --- a/src/util.ts +++ b/src/util.ts @@ -121,7 +121,7 @@ export function getVersionFromFileContent( let javaVersionRegExp: RegExp; if (versionFile == '.tool-versions') { javaVersionRegExp = - /^(java\s+)?v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; + /^(java\s+)(?:\S+-)v?(?(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(-ea(\.\d+)?)?)$/m; } else if (versionFile == '.java-version') { javaVersionRegExp = /(?(?<=(^|\s|-))(\d+\S*))(\s|$)/; } else {