Skip to content

[3.10.x] Convert paths for MSYS2 and jvm.config placeholders in bin/mvn - #12567

Open
gnodet wants to merge 1 commit into
maven-3.10.xfrom
backport/12546-to-3.10.x
Open

[3.10.x] Convert paths for MSYS2 and jvm.config placeholders in bin/mvn#12567
gnodet wants to merge 1 commit into
maven-3.10.xfrom
backport/12546-to-3.10.x

Conversation

@gnodet

@gnodet gnodet commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Summary

Backport of #12546 to the maven-3.10.x branch, adapted for the different script location (src/bin/mvn vs src/assembly/maven/bin/mvn) and the simpler jvm.config handling (no JvmConfigParser on this branch).

  • Detect MSYS2 (MSYS_NT-*) alongside MinGW in uname matching
  • Guard against missing cygpath(1) — warn and fall back to POSIX paths
  • Convert all paths (MAVEN_HOME, CLASSWORLDS_JAR, MAVEN_PROJECTBASEDIR, jline-native) for both Cygwin and MinGW/MSYS2, not just Cygwin
  • Convert jline-native path separately to avoid mixed separators (C:\maven/lib/jline-native)
  • Use printf instead of echo for values holding paths (avoid backslash expansion in dash/ash)
  • Add shell test covering Cygwin, MinGW, MSYS2, and missing-cygpath fallback, wired into the build via exec-maven-plugin

Test plan

  • Shell test passes locally (21/21 assertions)
  • CI passes on all platforms (Linux, macOS, Windows)

🤖 Generated with Claude Code

Backport of #12546 to the 3.10.x branch. Adapted for the different script
location (src/bin/mvn vs src/assembly/maven/bin/mvn) and the simpler
jvm.config handling (no JvmConfigParser on this branch).

Key changes:
- Detect MSYS2 (MSYS_NT-*) alongside MinGW in uname matching
- Guard against missing cygpath(1) — warn and fall back to POSIX paths
- Convert all paths (MAVEN_HOME, CLASSWORLDS_JAR, MAVEN_PROJECTBASEDIR,
  jline-native) for both Cygwin and MinGW/MSYS2, not just Cygwin
- Convert jline-native path separately to avoid mixed separators
- Use printf instead of echo for values holding paths (avoid backslash
  expansion in dash/ash)
- Add shell test covering Cygwin, MinGW, MSYS2, and missing-cygpath
  fallback, wired into the build via exec-maven-plugin

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

@gnodet gnodet left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM — clean backport of #12546 (merged on master) to maven-3.10.x. Well-adapted for the branch differences: different script location (src/bin/mvn vs src/assembly/maven/bin/mvn) and no JvmConfigParser on this branch. The core improvements are all present: MSYS2 detection, cygpath guard with fallback, printf-over-echo for Windows paths, and comprehensive test script. The test script also includes the macOS $TMPDIR normalization fix from the follow-up commit.

This review was generated by an AI agent and may contain inaccuracies. Please verify all suggestions before applying.

Claude Code on behalf of gnodet

gnodet added a commit to gnodet/maven that referenced this pull request Jul 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant