From dc9c87a977425fa947218e309d26260faad9caeb Mon Sep 17 00:00:00 2001
From: Cheng Pan <pan3793@gmail.com>
Date: Fri, 30 Jan 2026 14:27:11 +0800
Subject: [PATCH 1/2] Support detecting Maven Wrapper

---
 precommit/src/main/shell/plugins.d/maven.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/precommit/src/main/shell/plugins.d/maven.sh b/precommit/src/main/shell/plugins.d/maven.sh
index 5d4239a28..16fbacc8e 100755
--- a/precommit/src/main/shell/plugins.d/maven.sh
+++ b/precommit/src/main/shell/plugins.d/maven.sh
@@ -16,10 +16,12 @@
 
 declare -a MAVEN_ARGS
 
-if [[ -z "${MAVEN_HOME:-}" ]]; then
-  MAVEN=mvn
-else
+if [[ -n "${MAVEN_HOME:-}" ]]; then
   MAVEN=${MAVEN_HOME}/bin/mvn
+elif [[ -e "${BASEDIR}/mvnw" ]]; then
+  MAVEN=${BASEDIR}/mvnw
+else
+  MAVEN=mvn
 fi
 
 MAVEN_CUSTOM_REPOS=false
@@ -78,7 +80,7 @@ function maven_ws_replace
 function maven_usage
 {
   maven_ws_replace
-  yetus_add_option "--mvn-cmd=<file>" "The 'mvn' command to use (default \${MAVEN_HOME}/bin/mvn, or 'mvn')"
+  yetus_add_option "--mvn-cmd=<file>" "The 'mvn' command to use (default \${MAVEN_HOME}/bin/mvn, \${BASEDIR}/mvnw, or 'mvn')"
   yetus_add_option "--mvn-custom-repos" "Use per-project maven repos"
   yetus_add_option "--mvn-custom-repos-dir=<dir>" "Location of repos, default is '${MAVEN_CUSTOM_REPOS_DIR}'"
   yetus_add_option "--mvn-deps-order=<bool>" "Disable maven's auto-dependency module ordering (Default: '${MAVEN_DEPENDENCY_ORDER}')"

From 62639b82d272d350f492737e27aec864503db12d Mon Sep 17 00:00:00 2001
From: Cheng Pan <pan3793@gmail.com>
Date: Sat, 31 Jan 2026 23:38:49 +0800
Subject: [PATCH 2/2] Reorder MAVEN command preference logic

---
 precommit/src/main/shell/plugins.d/maven.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/precommit/src/main/shell/plugins.d/maven.sh b/precommit/src/main/shell/plugins.d/maven.sh
index 16fbacc8e..ccc8bc65b 100755
--- a/precommit/src/main/shell/plugins.d/maven.sh
+++ b/precommit/src/main/shell/plugins.d/maven.sh
@@ -16,10 +16,10 @@
 
 declare -a MAVEN_ARGS
 
-if [[ -n "${MAVEN_HOME:-}" ]]; then
-  MAVEN=${MAVEN_HOME}/bin/mvn
-elif [[ -e "${BASEDIR}/mvnw" ]]; then
+if [[ -e "${BASEDIR}/mvnw" ]]; then
   MAVEN=${BASEDIR}/mvnw
+elif [[ -n "${MAVEN_HOME:-}" ]]; then
+  MAVEN=${MAVEN_HOME}/bin/mvn
 else
   MAVEN=mvn
 fi
@@ -80,7 +80,7 @@ function maven_ws_replace
 function maven_usage
 {
   maven_ws_replace
-  yetus_add_option "--mvn-cmd=<file>" "The 'mvn' command to use (default \${MAVEN_HOME}/bin/mvn, \${BASEDIR}/mvnw, or 'mvn')"
+  yetus_add_option "--mvn-cmd=<file>" "The 'mvn' command to use (default \${BASEDIR}/mvnw, \${MAVEN_HOME}/bin/mvn, or 'mvn')"
   yetus_add_option "--mvn-custom-repos" "Use per-project maven repos"
   yetus_add_option "--mvn-custom-repos-dir=<dir>" "Location of repos, default is '${MAVEN_CUSTOM_REPOS_DIR}'"
   yetus_add_option "--mvn-deps-order=<bool>" "Disable maven's auto-dependency module ordering (Default: '${MAVEN_DEPENDENCY_ORDER}')"