Skip to content

Update Regex to Support All ASDF Versions for the supported distributions in tool-versions File #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v-HarithaVattikuti merged 20 commits into from
Sep 16, 2025
Merged

Update Regex to Support All ASDF Versions for the supported distributions in tool-versions File #767

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4dcdbcd
Regex update to fix #719
Mar 18, 2025
7872dcf
Check failures fix
Mar 20, 2025
0bd6823
npm run format, npm run format-check & npm run build
Mar 20, 2025
cb386ac
Regex update
Mar 21, 2025
368c98a
regex update
Apr 28, 2025
b0d0904
Merge remote-tracking branch 'origin/main' into toolversions-regex-up…
Apr 28, 2025
cfefdbc
Merge branch 'main' into toolversions-regex-update
v-aparnajyothi-y Apr 28, 2025
a35ec49
fixed check failures
Apr 28, 2025
88a3812
updated regex
May 5, 2025
cda1881
regex update for all the versions
May 16, 2025
4482507
regex and docmentation update
May 30, 2025
c981c0e
Regex update
Jul 2, 2025
250752c
format and doc update
Jul 28, 2025
8fa56ab
doc format update
Jul 30, 2025
2ccd746
npm audit fix
Jul 31, 2025
f4d4543
resolve conflicts
Aug 4, 2025
684674e
resolve conflicts
Aug 4, 2025
baaaebd
resolve conflicts
Aug 4, 2025
f7a12f1
doc update
Aug 11, 2025
7b9321c
Java version upgrade
Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Check failures fix
  • Loading branch information
Aparna Jyothi
Aparna Jyothi committed Mar 20, 2025
commit 7872dcf07b2f1d448f70de42ea50726075db6dc0
2 changes: 1 addition & 1 deletion dist/cleanup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97075,7 +97075,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
const versionFileName = getFileName(versionFile);
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:(?<distribution>\S+)-)?(?<version>\d+\.\d+\.\d+(\.\d+)?)(\+\d+(\.\d+)?)?(-[a-zA-Z0-9]+)?(\.LTS)?$/m;
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
}
else {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
Expand Down
2 changes: 1 addition & 1 deletion dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135080,7 +135080,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
const versionFileName = getFileName(versionFile);
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
/^(java\s+)(?:(?<distribution>\S+)-)?(?<version>\d+\.\d+\.\d+(\.\d+)?)(\+\d+(\.\d+)?)?(-[a-zA-Z0-9]+)?(\.LTS)?$/m;
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;
}
else {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
Expand Down
3 changes: 2 additions & 1 deletion src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ export function getVersionFromFileContent(
const versionFileName = getFileName(versionFile);
if (versionFileName == '.tool-versions') {
javaVersionRegExp =
Comment thread
v-aparnajyothi-y marked this conversation as resolved.
/^(java\s+)(?:(?<distribution>\S+)-)?(?<version>\d+\.\d+\.\d+(\.\d+)?)(\+\d+(\.\d+)?)?(-[a-zA-Z0-9]+)?(\.LTS)?$/m;
/^(java\s+)(?:\S*-)?v?(?<version>(\d+)(\.\d+)?(\.\d+)?(\+\d+)?(\.\d+)?(-ea(\.\d+)?)?(\.LTS)?)$/m;

} else {
javaVersionRegExp = /(?<version>(?<=(^|\s|-))(\d+\S*))(\s|$)/;
}
Expand Down