Repository navigation
Commit 8ae6c83
* Start fix for #622
Assisted-by: Claude Code:claude-opus-5-5
* Vendor Maven 4 implicit subprojects as a reactor
Maven 4 builds every child directory holding a pom.xml of a 4.1.0
pom-packaged root that lists no <subprojects>. vendor planned such a
root as a reactor of one, so the modules that use the patched library
kept the base version and a warm ~/.m2 build used Central's unpatched
jar, while vendor, vendor --check and vex all reported success.
The reactor walk now discovers those subprojects the way Maven 4 does
(model version, pom packaging, the maven.project.discoverSubprojects
opt-out), and every reactor entry point (plan, check, vex, revert, the
not-build-root guard) gets the directory listing it needs.
Fixes #622
Assisted-by: Claude Code:claude-opus-5-5
* Probe Maven 4 subprojects through the listing
Discovery read each subdirectory's pom.xml to test that it exists. In a
git checkout that read went through .git/, which the project reader
refuses and records as a read error, so vex and vendor --check would
fail on every Maven 4 project that relies on discovery. Test for the
pom through the directory listing instead, which lists a refused
directory as empty, and share the in-memory listing helper between the
gradle and maven test modules.
Assisted-by: Claude Code:claude-opus-5-5
* Skip outbound dir links in Maven 4 discovery
Discovery lists every child directory to see whether it holds a
pom.xml. A directory symlinked outside the checkout, such as a target/
on another disk, was recorded as an escape on that listing alone, so
vendor refused an otherwise valid Maven 4 project. The project reader
now only peeks at such a directory (files, no subdirectories) without
recording the escape. A pom found there still becomes a module, and
reading it still refuses the build as one that leaves the checkout.
Assisted-by: Claude Code:claude-opus-5-5
---------
Co-authored-by: Claude <noreply@anthropic.com>
1 parent dad6408 commit 8ae6c83
7 files changed
Lines changed: 575 additions & 75 deletions
File tree
- crates
- socket-patch-cli/tests
- socket-patch-core/src/vendor
- jvm
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
575 | 575 | | |
576 | 576 | | |
577 | 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 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
578 | 743 | | |
579 | 744 | | |
580 | 745 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
198 | 198 | | |
199 | 199 | | |
200 | 200 | | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
201 | 208 | | |
202 | | - | |
| 209 | + | |
203 | 210 | | |
204 | | - | |
| 211 | + | |
205 | 212 | | |
206 | 213 | | |
207 | 214 | | |
208 | | - | |
209 | | - | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
210 | 226 | | |
211 | 227 | | |
212 | 228 | | |
| |||
219 | 235 | | |
220 | 236 | | |
221 | 237 | | |
222 | | - | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
223 | 243 | | |
224 | 244 | | |
225 | 245 | | |
226 | 246 | | |
227 | 247 | | |
228 | 248 | | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
229 | 260 | | |
230 | 261 | | |
231 | 262 | | |
| |||
269 | 300 | | |
270 | 301 | | |
271 | 302 | | |
272 | | - | |
| 303 | + | |
273 | 304 | | |
274 | 305 | | |
275 | 306 | | |
| |||
281 | 312 | | |
282 | 313 | | |
283 | 314 | | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
284 | 318 | | |
285 | 319 | | |
286 | 320 | | |
| |||
593 | 627 | | |
594 | 628 | | |
595 | 629 | | |
| 630 | + | |
596 | 631 | | |
597 | 632 | | |
598 | 633 | | |
| |||
625 | 660 | | |
626 | 661 | | |
627 | 662 | | |
628 | | - | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
629 | 667 | | |
630 | 668 | | |
631 | 669 | | |
| |||
837 | 875 | | |
838 | 876 | | |
839 | 877 | | |
| 878 | + | |
840 | 879 | | |
841 | 880 | | |
842 | 881 | | |
843 | 882 | | |
844 | 883 | | |
845 | 884 | | |
846 | | - | |
| 885 | + | |
847 | 886 | | |
848 | 887 | | |
849 | 888 | | |
| |||
878 | 917 | | |
879 | 918 | | |
880 | 919 | | |
881 | | - | |
| 920 | + | |
882 | 921 | | |
883 | 922 | | |
884 | 923 | | |
| |||
892 | 931 | | |
893 | 932 | | |
894 | 933 | | |
| 934 | + | |
895 | 935 | | |
896 | 936 | | |
897 | 937 | | |
898 | 938 | | |
899 | 939 | | |
900 | | - | |
| 940 | + | |
901 | 941 | | |
902 | 942 | | |
903 | 943 | | |
| |||
1000 | 1040 | | |
1001 | 1041 | | |
1002 | 1042 | | |
1003 | | - | |
| 1043 | + | |
1004 | 1044 | | |
1005 | 1045 | | |
1006 | 1046 | | |
| |||
1020 | 1060 | | |
1021 | 1061 | | |
1022 | 1062 | | |
1023 | | - | |
| 1063 | + | |
1024 | 1064 | | |
1025 | 1065 | | |
1026 | 1066 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2443 | 2443 | | |
2444 | 2444 | | |
2445 | 2445 | | |
| 2446 | + | |
2446 | 2447 | | |
2447 | 2448 | | |
2448 | 2449 | | |
| |||
2495 | 2496 | | |
2496 | 2497 | | |
2497 | 2498 | | |
2498 | | - | |
2499 | | - | |
2500 | | - | |
2501 | | - | |
2502 | | - | |
2503 | | - | |
2504 | | - | |
2505 | | - | |
2506 | | - | |
2507 | | - | |
2508 | | - | |
2509 | | - | |
2510 | | - | |
2511 | | - | |
2512 | | - | |
2513 | | - | |
2514 | | - | |
2515 | | - | |
2516 | | - | |
2517 | | - | |
2518 | | - | |
2519 | | - | |
2520 | | - | |
2521 | 2499 | | |
2522 | 2500 | | |
2523 | 2501 | | |
| |||
0 commit comments