[maven] branch master updated: [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts

[mi...@apache.org]

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

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/master by this push:
     new b8cdac5  [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts
b8cdac5 is described below

commit b8cdac5573a27e97540dc1fd7b50fbe4de7d4410
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 19 22:04:55 2021 +0200

    [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts
    
    This closes #490
---
 apache-maven/src/assembly/shared/init     | 2 +-
 apache-maven/src/assembly/shared/init.cmd | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index 25e22d3..e369c6b 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -114,7 +114,7 @@ concat_lines() {
   fi
 }
 
-MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir "$@"`}"
+MAVEN_PROJECTBASEDIR="`find_maven_basedir "$@"`"
 MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
 
 # For Cygwin, switch project base directory path to Windows format before
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
index ef1e8ec..a74ca4b 100755
--- a/apache-maven/src/assembly/shared/init.cmd
+++ b/apache-maven/src/assembly/shared/init.cmd
@@ -7,9 +7,6 @@ set MAVEN_CMD_LINE_ARGS=%*
 @REM Find the project basedir, i.e., the directory that contains the directory ".mvn".
 @REM Fallback to current working directory if not found.
 
-set "MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%"
-if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
 set "EXEC_DIR=%CD%"
 set "WDIR=%EXEC_DIR%"