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

   ## Backport of #12747
   
   Cherry-pick of #12747 onto `maven-4.0.x`.
   
   **Original PR:** #12747 - Preserve coordinates when merging InputLocation
   **Original author:** @ulofiai
   **Target branch:** `maven-4.0.x`
   
   ### Original description
   
   Fixes #12610.
   
   Update the InputLocation MDO template so generated Maven API merge results 
retain line and column information. The boolean overload uses the dominant 
input location and falls back to the other input when its coordinates are 
unknown; indexed list merges prefer the target and use the source as fallback.
   
   Add regression coverage for both merge overloads.
   
   ### Backport notes
   
   Resolved a merge conflict in `src/mdo/java/InputLocation.java`: the 
`maven-4.0.x` branch does not use Velocity `#if ( $isMavenModel )` 
conditionals, so the coordinate preservation logic was adapted to work directly 
with `InputLocation.of(...)` and `target.getSource()` (matching the existing 
code style on this branch).


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