(incubator-streampark) branch dev-2.1.2 updated: [Improve] get MAVEN_HOME improvement

[benjobs]

This is an automated email from the ASF dual-hosted git repository.

benjobs pushed a commit to branch dev-2.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.2 by this push:
     new 20d4953d0 [Improve] get MAVEN_HOME improvement
20d4953d0 is described below

commit 20d4953d00a88ffdfc463f2f88d4ad8d1f2c78f5
Author: benjobs <benj...@gmail.com>
AuthorDate: Fri Dec 1 00:38:53 2023 +0800

    [Improve] get MAVEN_HOME improvement
---
 .../apache/streampark/console/core/entity/Project.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index c5c37b172..aaa6d2970 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -188,14 +188,19 @@ public class Project implements Serializable {
 
   @JsonIgnore
   public String getMavenArgs() {
-    String mvn = "mvn";
     boolean windows = Utils.isWindows();
+    String mvn = windows ? "mvn.cmd" : "mvn";
+
+    String mavenHome = System.getenv("M2_HOME");
+    if (mavenHome == null) {
+      mavenHome = System.getenv("MAVEN_HOME");
+    }
+    if (mavenHome != null) {
+      mvn = mavenHome + "/bin/" + mvn;
+    }
+
     try {
-      if (windows) {
-        CommandUtils.execute("mvn.cmd --version");
-      } else {
-        CommandUtils.execute("mvn --version");
-      }
+      CommandUtils.execute(mvn + " --version");
     } catch (Exception e) {
       File wrapperJar = new 
File(WebUtils.getAppHome().concat("/.mvn/wrapper/maven-wrapper.jar"));
       if (wrapperJar.exists()) {