-
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] merge snapshotVersions in repository metadata correctly #681
Conversation
779226b
to
d831705
Compare
@michael-o This is how I think the merge is reasonable. The same named method in Line 72 in 69d6c6d
Metadata.merge() as the former does a recessive merge but I don't think this is reasonable here, therefore I don't think we have to consider it here any further.
I think it boils down to the question whether multiple or only one Update: I updated the code to be in line with RemoteSnapshotMetadata.merge() now and made sure that only the most recent version per classifier/extension is listed in the metadata. |
@kwin Going through. Do you think that the impl in Resolver is correct? |
</field> | ||
<field> | ||
<name>updated</name> | ||
<version>1.1.0+</version> | ||
<type>String</type> | ||
<description>The timestamp when this version information was last updated. The timestamp is expressed using UTC in the format yyyyMMddHHmmss.</description> | ||
<identifier>true</identifier> |
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.
Can you show where version
and updated
are part of an id now?
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 is for letting Modello generate a complete equals
method which is used e.g. in https://github.com/apache/maven/pull/681/files#diff-a8781d28a4f703eaad1745f9002678d2e273d9189fb9a5f97a79df346f4c1953R129
yes, but you have to keep in mind how its merge is called ( maven/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java Line 75 in 69d6c6d
|
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.
Please remove the copied classes from Resolver. This makes the test brittle for the future.
…data merge Coauthored-by: Konrad Windszus <kwin@apache.org> This closes apache#681
7df95f4
to
e7812c6
Compare
Please provide a backport for 3.8.x |
…data merge Coauthored-by: Konrad Windszus <kwin@apache.org> This closes apache#681
e7812c6
to
4fd9bb7
Compare
…data merge Coauthored-by: Konrad Windszus <kwin@apache.org> This closes apache#681
Done in #684 |
metadata merge Co-authored-by: Konrad Windszus <kwin@apache.org> This closes apache#681
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 replaceMNG-XXX
and
SUMMARY
with the appropriate JIRA issue. Best practice is to use the JIRA issuetitle 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.
This builds upon the work from #371 and supersedes it.