Skip to content

Fix pointing exact version with BP_JAVA_VERSION #1358

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

Open
kiril-keranov wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −0
Open

Fix pointing exact version with BP_JAVA_VERSION #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19d4646
Fix exact version for BP_JAVA_VERSION
kiril-keranov Jul 10, 2026
fa422c2
Add test
kiril-keranov Jul 10, 2026
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
6 changes: 6 additions & 0 deletions src/java/jres/jre.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,12 @@ func normalizeVersionPattern(version string) string {
if strings.Contains(version, "*") {
return version
}
// Exact patch version (e.g. "17.0.13") — already fully specified, don't append ".*"
// which would produce an unmatchable pattern like "17.0.13.*".
exactVersionRegex := regexp.MustCompile(`^\d+\.\d+\.\d+$`)

@stokpop stokpop Jul 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although this code is probably not on a hot path, you can also hoist regexes so its no compiled for each call, e.g.

var threePartVersionPattern = regexp.MustCompile(`^\d+\.\d+\.\d+$`)

func isValidVersion(version string) bool {
	return threePartVersionPattern.MatchString(version)
}

if exactVersionRegex.MatchString(version) {
return version
}
return version + ".*"
}

Expand Down
8 changes: 8 additions & 0 deletions src/java/jres/jre_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,14 @@ dependencies:
Expect(dep.Name).To(Equal("openjdk"))
Expect(dep.Version).To(Equal("17.0.13"))
})

It("resolves exact patch version", func() {
os.Setenv("BP_JAVA_VERSION", "17.0.13")

@stokpop stokpop Jul 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The basic fix probably works as far as I can tell, but the actual versions of JRE are like: X.Y.Z+W format (17.0.19+11). Consider adding a test where BP_JAVA_VERSION resolves against a manifest entry 17.0.19+11.

I also thought we use "JBP_CONFIG_OPEN_JDK_JRE: '{ jre: { version: "25.0.3" } }'", I assume the fix also works for those cases, but maybe also add test case to be sure.

dep, err := jres.GetJREVersion(ctx, "openjdk")
Expect(err).NotTo(HaveOccurred())
Expect(dep.Name).To(Equal("openjdk"))
Expect(dep.Version).To(Equal("17.0.13"))
})
})

Context("without BP_JAVA_VERSION", func() {
Expand Down