Repository navigation
Commit a4ebd05
* Start fix for #655
Assisted-by: Claude Code:claude-opus-5-5
* Patch Maven deps named via ${prop} coordinates
A reactor module that declares the patched library as
<groupId>${ct.group}</groupId> / <artifactId>${ct.artifact}</artifactId>
was skipped by the vendored Maven planner, which compared the raw
element text with the patch coordinates. Maven interpolates those
elements before matching, so the module kept its literal base version
and built Central's unpatched jar while vendor, vendor --check and vex
all reported it patched.
The planner, the external-management check and the revert now match
declarations on interpolated coordinates. A coordinate whose property
is not defined in the checkout gets a property_unresolved warning
instead of passing silently.
Fixes #655
Assisted-by: Claude Code:claude-opus-5-5
* Guard ${prop} Maven coordinates edge cases
Follow-ups from review of the #655 fix:
- A module that inherits a ${prop}-named declaration and overrides the
property names a different artifact; vendor now leaves the
declaration alone and warns coordinates_overridden instead of
pointing that module at a version that does not exist.
- Declarations matched through properties get their own record-key
ordinals, so revert of a project vendored by an older release still
finds each literal declaration's original version.
- ${project.groupId} and ${project.artifactId} resolve.
- The unresolved-coordinate warning respects literal text around the
property and skips classifier and non-jar variants, so unrelated
dependencies no longer warn.
Assisted-by: Claude Code:claude-opus-5-5
---------
Co-authored-by: Claude <noreply@anthropic.com>
1 parent ec9aabc commit a4ebd05
2 files changed
Lines changed: 407 additions & 13 deletions
File tree
- crates
- socket-patch-cli/tests
- socket-patch-core/src/vendor/jvm
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
544 | 544 | | |
545 | 545 | | |
546 | 546 | | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
| 583 | + | |
| 584 | + | |
| 585 | + | |
| 586 | + | |
| 587 | + | |
| 588 | + | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
547 | 631 | | |
548 | 632 | | |
549 | 633 | | |
| |||
0 commit comments