Repository navigation
Backport client option fixes and daemon-less --version to 1.x - #1940
Merged
Merged
Conversation
(cherry picked from commit 80f2fc1) Adapted: Java 8 set construction instead of Set.of; merged with the VOID-option handling already on 1.x.
(cherry picked from commit 42eea9e) Applied unchanged; the 1.x code has the same structure.
(cherry picked from commit d3c15a7) Adapted: JvmTestClient merged by hand (no augmentArgs on 1.x); the MavenConfIgnoreExtNativeIT hunk is omitted, that test does not exist on 1.x.
(cherry picked from commits 2962aa8, ad49056, 9219c77 and eaaa2e5) Adapted: 1.x DefaultClient lives in java-mvnd, so the output is built by a new VersionInfo class in client/src/main/java with a unit test. It also keeps the Java version, locale and OS lines of mvn -v and reads the Maven build number from maven-core in mvn/lib, which master's output drops.
slachiewicz
marked this pull request as ready for review
November 15, 2026 20:47
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backports four client changes from master to
mvnd-1.x: fail-mode option parsing (#1684), daemon reuse with--debug(#1483), the test framework restoring system properties (#1359), andmvnd --versionprinting without connecting to a daemon (#282).--versionskips the daemon only for a plain-v; with-q,--helpor an mvnd command option it takes the daemon path as before. The output follows Maven 3.9'sCLIReportingUtils.showVersion, and the Java line is read from thereleasefile of the daemon's Java home.The commits keep their original authors, so merge with "Rebase and merge".
I have not run the native ITs locally.
Verified:
./mvnw -pl integration-tests -am verifyunder JDK 17 → 47 integration tests, 0 failures.