Repository navigation
Commit a8a10dc
* Start fix for #535, #550
Assisted-by: Claude Code:claude-opus-5-5
* Read maven.config properties the way Maven does
Vendoring a Maven reactor reads user properties from .mvn/maven.config
so an override there beats a pom <properties> value. The reader split
the whole file on whitespace and kept only -Dk=v tokens, so it:
- used properties from commented-out "#" lines, which Maven 3.9+
ignores, and
- missed --define=k=v and "-D k=v" (or -D and k=v on separate lines),
which Maven applies.
Either way vendor could rewrite a ${prop} dependency to the patched
base, silently downgrading the build (and vex then attested it), or
refuse a patch that should apply. Comment lines are now skipped, every
-D/--define spelling is read, and -Dk sets k=true as in Maven.
Fixes #535, #550.
Assisted-by: Claude Code:claude-opus-5-5
* Read maven.config one argument per line
Maven 3.9+ reads each maven.config line as one argument. Follow that:
the value of -Dk=v is the rest of the line (so "-Dv=1.0 # note" is not
1.0), a wholly quoted argument is unquoted, trimming matches Java's
String.trim, and a bare -D never swallows the next option.
Assisted-by: Claude Code:claude-opus-5-5
* Keep pre-3.9 multi-argument maven.config lines
Maven before 3.9 splits .mvn/maven.config on whitespace, so a line like
`-B -Dct.version=1.11.0` or `-Dfoo=1 -Dct.version=1.11.0` defines
ct.version there. The old reader caught those tokens; the per-line reader
dropped them, which let the planner rewrite a pom to the patched base
while a Maven 3.6/3.8 build applies the override. Add any `-Dk=v` token
from a whitespace split of the non-comment lines that the per-line
reading did not define. Recognising an override that Maven 3.9 would not
apply only makes the planner refuse to pin, so this stays fail-closed.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011f9aeRoPDBr4nQsvdEk3uV
---------
Co-authored-by: Claude <noreply@anthropic.com>
1 parent a4ebd05 commit a8a10dc
1 file changed
Lines changed: 150 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1399 | 1399 | | |
1400 | 1400 | | |
1401 | 1401 | | |
1402 | | - | |
| 1402 | + | |
1403 | 1403 | | |
1404 | 1404 | | |
1405 | 1405 | | |
| |||
1956 | 1956 | | |
1957 | 1957 | | |
1958 | 1958 | | |
1959 | | - | |
| 1959 | + | |
| 1960 | + | |
| 1961 | + | |
| 1962 | + | |
| 1963 | + | |
| 1964 | + | |
| 1965 | + | |
| 1966 | + | |
| 1967 | + | |
1960 | 1968 | | |
1961 | | - | |
1962 | | - | |
1963 | | - | |
1964 | | - | |
1965 | | - | |
| 1969 | + | |
| 1970 | + | |
| 1971 | + | |
| 1972 | + | |
| 1973 | + | |
| 1974 | + | |
| 1975 | + | |
| 1976 | + | |
| 1977 | + | |
| 1978 | + | |
| 1979 | + | |
| 1980 | + | |
| 1981 | + | |
| 1982 | + | |
| 1983 | + | |
| 1984 | + | |
| 1985 | + | |
| 1986 | + | |
| 1987 | + | |
| 1988 | + | |
| 1989 | + | |
| 1990 | + | |
| 1991 | + | |
| 1992 | + | |
| 1993 | + | |
| 1994 | + | |
| 1995 | + | |
| 1996 | + | |
| 1997 | + | |
| 1998 | + | |
| 1999 | + | |
| 2000 | + | |
| 2001 | + | |
| 2002 | + | |
| 2003 | + | |
| 2004 | + | |
| 2005 | + | |
| 2006 | + | |
| 2007 | + | |
| 2008 | + | |
| 2009 | + | |
| 2010 | + | |
| 2011 | + | |
| 2012 | + | |
| 2013 | + | |
| 2014 | + | |
| 2015 | + | |
| 2016 | + | |
| 2017 | + | |
| 2018 | + | |
1966 | 2019 | | |
1967 | 2020 | | |
1968 | 2021 | | |
| |||
3865 | 3918 | | |
3866 | 3919 | | |
3867 | 3920 | | |
| 3921 | + | |
| 3922 | + | |
| 3923 | + | |
| 3924 | + | |
| 3925 | + | |
| 3926 | + | |
| 3927 | + | |
| 3928 | + | |
| 3929 | + | |
| 3930 | + | |
| 3931 | + | |
| 3932 | + | |
| 3933 | + | |
| 3934 | + | |
| 3935 | + | |
| 3936 | + | |
| 3937 | + | |
| 3938 | + | |
| 3939 | + | |
| 3940 | + | |
| 3941 | + | |
| 3942 | + | |
| 3943 | + | |
| 3944 | + | |
| 3945 | + | |
| 3946 | + | |
| 3947 | + | |
| 3948 | + | |
| 3949 | + | |
| 3950 | + | |
| 3951 | + | |
| 3952 | + | |
| 3953 | + | |
| 3954 | + | |
| 3955 | + | |
| 3956 | + | |
| 3957 | + | |
| 3958 | + | |
| 3959 | + | |
| 3960 | + | |
| 3961 | + | |
| 3962 | + | |
| 3963 | + | |
| 3964 | + | |
| 3965 | + | |
| 3966 | + | |
| 3967 | + | |
| 3968 | + | |
| 3969 | + | |
| 3970 | + | |
| 3971 | + | |
| 3972 | + | |
| 3973 | + | |
| 3974 | + | |
| 3975 | + | |
| 3976 | + | |
| 3977 | + | |
| 3978 | + | |
| 3979 | + | |
| 3980 | + | |
| 3981 | + | |
| 3982 | + | |
| 3983 | + | |
| 3984 | + | |
| 3985 | + | |
| 3986 | + | |
| 3987 | + | |
| 3988 | + | |
| 3989 | + | |
| 3990 | + | |
| 3991 | + | |
| 3992 | + | |
| 3993 | + | |
| 3994 | + | |
| 3995 | + | |
| 3996 | + | |
| 3997 | + | |
| 3998 | + | |
| 3999 | + | |
| 4000 | + | |
| 4001 | + | |
| 4002 | + | |
| 4003 | + | |
| 4004 | + | |
| 4005 | + | |
| 4006 | + | |
| 4007 | + | |
| 4008 | + | |
| 4009 | + | |
| 4010 | + | |
3868 | 4011 | | |
3869 | 4012 | | |
3870 | 4013 | | |
| |||
0 commit comments