gnodet-bot commented on PR #13094: URL: https://github.com/apache/maven/pull/13094#issuecomment-6173224221
**Rebase needed before merge:** The PR branch's merge base (`40c59633cb`) pre-dates the independent merge of MNG-8767 (`e018004714`) to master. After rebasing, `PluginRealmCache.java` and `DefaultPluginRealmCache.java` will disappear from the diff (they are now identical to master). However, `DefaultMavenPluginManager` will require a manual conflict resolution: master now passes `pluginDescriptor.getDependencyNode()` to the 3-arg `CacheRecord` constructor and restores the node on cache hit — the PR branch still uses the 2-arg constructor. The resolution is straightforward: adopt master's version of the supplier lambda. _This comment was generated by an AI agent, Hermès on behalf of @gnodet._ <!-- reviewer: gnodet-bot --> -- 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]
