Skip to content
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

Closed
wants to merge 2 commits into from

Conversation

patope
Copy link

@patope patope commented Aug 28, 2020

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:

  • Make sure there is a JIRA issue filed
    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.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [MNG-XXX] - Fixes bug in ApproximateQuantiles,
    where you replace MNG-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA issue title in the pull request title and in the first line of the
    commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Run mvn clean verify to make sure basic checks pass. A more thorough check will
    be performed on your pull request automatically.
  • You have run the Core IT successfully.

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.

}
if ( s.isLocalCopy() != snapshot.isLocalCopy() )
{
s.setLocalCopy( snapshot.isLocalCopy() );
changed = true;
}
if (updateSnapshotVersions)
{
v.setSnapshotVersions( new java.util.ArrayList<SnapshotVersion>( versioning.getSnapshotVersions() ) );
Copy link
Member

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.

@michael-o
Copy link
Member

I wonders me why this is pseudo-merged:

Versioning versioning = recessive.getVersioning();
if ( versioning != null )
{
for ( SnapshotVersion sv : versioning.getSnapshotVersions() )
{
String key = getKey( sv.getClassifier(), sv.getExtension() );
if ( !versions.containsKey( key ) )
{
versions.put( key, sv );
}
}
}
if ( !legacyFormat )
{
metadata.getVersioning().setSnapshotVersions( new ArrayList<>( versions.values() ) );
}
}

The properly determine the diff, but throw away everything existent. Looks weird to me.

@michael-o
Copy link
Member

Willing to merge when this one is addressed.

@patope
Copy link
Author

patope commented Oct 10, 2020

I started to think is this correct fix after all.. wagon's merge-repo command uses this, but maybe this should be used for local repositories only. Maybe wagon should use RemoteSnapshotMetadata instead? Currently this is not possible due visibility limitations.

@michael-o
Copy link
Member

I started to think is this correct fix after all.. wagon's merge-repo command uses this, but maybe this should be used for local repositories only. Maybe wagon should use RemoteSnapshotMetadata instead? Currently this is not possible due visibility limitations.

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.

@michael-o
Copy link
Member

@kwin please pick up where @patope has left off in a new PR.

@michael-o
Copy link
Member

Closing in favor of #681.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants