Use ComparableVersion from Maven and remove the duplicate #898
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
|
@slawekjaranowski please review. |
andrzejj0
commented
Jan 3, 2023
| * @param artifactVersion version in a text format | ||
| * @param segment most major segment that can change, i.e. <em>not</em> held in place | ||
| */ | ||
| public BoundArtifactVersion(String artifactVersion, Segment segment) { |
There was a problem hiding this comment.
So this is the key method, I guess...
Hope this is clear, looks a bit like first year's comp-sci exercise, but we're simply parsing the version and splitting it to tokens upon:
- a change from numbers to letters or vice-versa
- an - character
- a dot
The newly constructed version will have Inetger.MAX_VALUE on all places less than the fixed segment. Also, all non-strandard tokens will be replaced by zeros (like in the old impl).
andrzejj0
force-pushed
the
remove-comparable-version
branch
from
1d94d5a
to
507d897
Compare
|
@slawekjaranowski please review |
srowen
pushed a commit
to apache/spark
that referenced
this pull request
Mar 3, 2023
### What changes were proposed in this pull request? This pr aims upgrade `versions-maven-plugin` to 2.15.0 ### Why are the changes needed? New version bring some improvements like: - mojohaus/versions#898 - mojohaus/versions#883 - mojohaus/versions#878 - mojohaus/versions#893 and some bug fix: - mojohaus/versions#901 - mojohaus/versions#897 - mojohaus/versions#891 The full release notes as follows: - https://github.com/mojohaus/versions/releases/tag/2.15.0 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? - GA `Dependencies test` should work normally - Manually check `./dev/test-dependencies.sh --replace-manifest`, run successful Closes #40248 from LuciferYang/SPARK-42648. Authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Sean Owen <srowen@gmail.com>
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.
Removing the duplicated ComparableVersion, which is also present in Maven.
Because it's removed, I had to rework BoundArtifactVersion a bit. Now it's not "hacking" ComparableVersion anymore, ie, it's no longer using its private implementation to compute compareTo(). Instead, it's construction "infinity-like" version by using Integer.MAX_INT and uses this to do the comparison on the standard DefaultArtifactVersion.
BoundArtifactVersion is also officially, contractually immutable, and because of that, its
parseVersionmethod throws an exception and is deprecated.Also, because the ComparableVersion is gone, the cache is also gone, so I've implemented our own, but went a bit further: we're caching DefaultArtifactVersion instead, since it's also (almost) immutable, and we're not using it's only mutating method
parseVersion()anywhere.On this condition, it's safe to use the cache.