gnodet commented on PR #12653:
URL: https://github.com/apache/maven/pull/12653#issuecomment-5453584985

   Integration test failure after merge conflict resolution:
   
   ```
   MavenITmng4403LenientDependencyPomParsingTest.testit:67 
   expected: <[org.apache.maven.its.mng4403:a:jar:0.1, 
org.apache.maven.its.mng4403:b:jar:0.1, org.apache.maven.its.mng4403:c:jar:0.1]>
   but was: <[org.apache.maven.its.mng4403:a:jar:0.1, 
org.apache.maven.its.mng4403:b:jar:0.1]>
   ```
   
   The conflict was in `DefaultModelObjectPool.java` where the PR used 
`dep.getLocationsHashCode()` (a precomputed hash) while master now uses 
`getLocationKeys()` + `locationsHashCode()` helper. I resolved by taking 
master's approach, but this may have broken the deduplication logic causing 
dependency `c` to be incorrectly deduplicated.
   
   @gnodet — please review the conflict resolution.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to