-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
[MNG-7644] Fix version comparison ( .X1 < -X2 for any string qualifier x ), 3.8.x branch #930
Conversation
09043b2
to
e5b1ecc
Compare
Does this really only apply to RC or anything else which has the pattern |
it is intended to apply to all string qualifiers: dot/hyphen{string item} |
Then please generalize the issue summary as well as the description and add more tests which depict that is general and not specific. Let's make this complete for master first and then I consent, then you can back port and save time. |
it's fair @michael-o, i updated the Jira and PRs/commits. |
@@ -53,7 +53,8 @@ | |||
* </ul> | |||
* Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive), | |||
* </li> | |||
* <li>a hyphen usually precedes a qualifier, and is always less important than something preceded with a dot.</li> | |||
* <li>a hyphen usually precedes a qualifier, and is always less important than digits/number, for example | |||
* 1.0.RC2 < 1.0-RC3 < 1.0.1 ; but prefer '1.0.0-RC1' over '1.0.0.RC1' </li> |
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.
This needs to be generalized as well.
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.
yes
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.
done
maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
Outdated
Show resolved
Hide resolved
maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java
Outdated
Show resolved
Hide resolved
98a9989
to
45562cd
Compare
Merged. |
@michael-o we may want to consider this a major change and reverting this one |
Then docs need to be reverted as well, no? |
the docs may need an update to explain how 3.x and 4.x treats the versions order differently |
Let's do the following: Keep the change with RC1/RC2 even 3.8.x with the docs in place and see whether there will be reports due to the change in behavior. If really someone complains I'd be willing to fix this regression and release 3.8.8 for this. Otherwise this edge case fix makes life much easier for others. |
Nice! thanks Michael |
The current version parser does not treat .RC and -RC correctly:
actual : 1.0.0.RC1 > 1.0.0-RC2
expected : 1.0.0.RC1 < 1.0.0-RC2
because RC1 < RC2
how to fix : place a list item before qualifier
as a consequence for any string qualifier x:
previously:
now:
Following this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MNG-XXX] SUMMARY
,where you replace
MNG-XXX
andSUMMARY
with the appropriate JIRA issue.[MNG-XXX] SUMMARY
.Best practice is to use the JIRA issue title in both the pull request title and in the first line of the commit message.
mvn clean verify
to make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.