Support JDK EA builds in JavaVersionDetector #279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jerboaa
reviewed
Apr 8, 2024
There was a problem hiding this comment.
This seems like a good patch. Especially since it allows for testing various strings. The case of java.version containing - would need a more generic solution, I think. Details on how java.version can look like is in: https://openjdk.org/jeps/223 In particular this:
Name Syntax
------------------------------ --------------
java.version $VNUM(\-$PRE)?
Comment on lines
17
to
18
| } else if (javaVersion.endsWith("-ea")) { | ||
| normalizedJavaVersion = javaVersion.substring(0, javaVersion.length() - 3); |
There was a problem hiding this comment.
Temurin 23 EA builds have java.version == 23-beta. For example:
jdk-23+15/bin/java -XshowSettings:properties --version 2>&1 | grep java\\.version
java.version = 23-beta
java.version.date = 2024-09-17
This would need to be handled as well.
There was a problem hiding this comment.
Added a test for -beta, and replaced the explicit -ea handling with uniform handling for -<anything>.
|
@johanhaleby can you check this please? |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The (current) scheme for JDK EA builds is
<major>-ea.The first commit extracts
getJavaMajorVersion(String)to make it testable.The second commit adds test cases for version string for the current LTS builds and the EA build (the EA test case fails).
The third commit adds EA detection and fixes the EA test case.
This PR should close #275 and close #277.