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.
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
Add buildnum extraction support for OpenJFX tags #241
Closed
+28
−3
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
@@ -52,16 +52,19 @@ private OpenJDKTag(Tag tag, String prefix, String version, String buildPrefix, S | ||
* jdk7u40-b20 -> jdk7u40 7u40 u20 -b 29 | ||
* hs24-b30 -> hs24 24 -b 30 | ||
* hs23.6-b19 -> hs23.6 23.6 .6 -b 19 | ||
* 11.1+22 -> 11.1 11.1 .1 + 22 | ||
*/ | ||
|
||
private final static String legacyOpenJDKVersionPattern = "(jdk([0-9]{1,2}(u[0-9]{1,3})?))"; | ||
private final static String legacyHSVersionPattern = "((hs[0-9]{1,2}(\\.[0-9]{1,3})?))"; | ||
private final static String legacyBuildPattern = "(-b)([0-9]{2,3})"; | ||
private final static String OpenJDKVersionPattern = "(jdk-([0-9]+(\\.[0-9]){0,3}))(\\+)([0-9]+)"; | ||
private final static String OpenJFXVersionPattern = "((?:jdk-){0,1}([1-9](?:(?:[0-9]*)(\\.(?:0|[1-9][0-9]*)){0,3})))(?:(\\+)([0-9]+)|(-ga))"; | ||
|
||
private final static List<Pattern> tagPatterns = List.of(Pattern.compile(legacyOpenJDKVersionPattern + legacyBuildPattern), | ||
Pattern.compile(legacyHSVersionPattern + legacyBuildPattern), | ||
Pattern.compile(OpenJDKVersionPattern)); | ||
Pattern.compile(OpenJDKVersionPattern), | ||
Pattern.compile(OpenJFXVersionPattern)); | ||
|
||
/** | ||
* Attempts to create an OpenJDKTag instance from a general Tag. | ||
@@ -106,6 +109,9 @@ public String version() { | ||
* @return | ||
*/ | ||
public int buildNum() { | ||
if (buildNum == null) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Under what conditions will this be null? When using a |
||
return 0; | ||
} | ||
return Integer.parseInt(buildNum); | ||
} | ||
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not related to this change, but the OpenJDKVersionPattern also will need support for
*-ga
tags.