Skip to content

Backport client option fixes and daemon-less --version to 1.x - #1940

Merged
slachiewicz merged 4 commits into
apache:mvnd-1.xfrom
slachiewicz:client-enhancements-1x
Nov 15, 2026
Merged

slachiewicz merged 4 commits into
apache:mvnd-1.xfrom
slachiewicz:client-enhancements-1x

Conversation

@slachiewicz

Copy link
Copy Markdown
Member

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), and mvnd --version printing without connecting to a daemon (#282).

--version skips the daemon only for a plain -v; with -q, --help or an mvnd command option it takes the daemon path as before. The output follows Maven 3.9's CLIReportingUtils.showVersion, and the Java line is read from the release file 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 verify under JDK 17 → 47 integration tests, 0 failures.

goutamadwant and others added 4 commits November 15, 2026 20:09
(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 slachiewicz added backport backport to a maintenance branch enhancement New feature or request labels Nov 15, 2026
@slachiewicz
slachiewicz marked this pull request as ready for review November 15, 2026 20:47
@slachiewicz
slachiewicz merged commit fc47329 into apache:mvnd-1.x Nov 15, 2026
9 checks passed
@github-actions github-actions Bot added this to the 1.0.7 milestone Nov 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport backport to a maintenance branch enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants