gnodet opened a new pull request, #13261:
URL: https://github.com/apache/maven/pull/13261

   Backport of #13253 (4398d6569d) to `maven-3.10.x`.
   
   Conflict resolution:
   - `maven-plugin-api/src/main/mdo/plugin.mdo`: descriptions from the commit 
applied, version tags kept at `1.0.0` (not `1.0.0+`), V4-only `resolutions` 
field discarded
   - `maven-model-builder/src/site/markdown/super-pom.md.vm`: restored (false 
conflict from git path mapping)
   - `compat/maven-plugin-api/src/main/mdo/plugin.mdo`: removed (path does not 
exist on 3.10.x flat layout)


-- 
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