-
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-5180] Fixes dangling snapshot versions in metadata after merge #371
Conversation
If build number or timestamp have changed, snapshot versions needs to be updated as well. see: https://github.com/apache/maven/blob/master/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java#L134
} | ||
if ( s.isLocalCopy() != snapshot.isLocalCopy() ) | ||
{ | ||
s.setLocalCopy( snapshot.isLocalCopy() ); | ||
changed = true; | ||
} | ||
if (updateSnapshotVersions) | ||
{ | ||
v.setSnapshotVersions( new java.util.ArrayList<SnapshotVersion>( versioning.getSnapshotVersions() ) ); |
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.
I think this one is wrong because it has to work like versions. Test whether the collection contains if not, add it. You are replacing the list and not merging.
I wonders me why this is pseudo-merged: Lines 121 to 138 in ecfff26
The properly determine the diff, but throw away everything existent. Looks weird to me. |
Willing to merge when this one is addressed. |
I started to think is this correct fix after all.. wagon's |
While I cannot clearly answer this question, why don't give it a try? Regardless of the Wagon problem, the behavior in Maven and Resolver should be consistent. Although, I do not know yet wether the key approach is logically correct. |
Closing in favor of #681. |
If build number or timestamp have changed, snapshot versions needs to
be updated as well.
see:
https://github.com/apache/maven/blob/master/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java#L134
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] - Fixes bug in ApproximateQuantiles
,where you replace
MNG-XXX
with the appropriate JIRA issue. Best practiceis to use the JIRA issue title in 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.