[maven] 02/06: [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)

[hboutemy]

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

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

commit bf59026554f954296bbedaa21359afc0a9c3e4b2
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sun Oct 10 20:07:36 2021 +0200

    [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from LAUNCHER_JAR)
---
 apache-maven/src/assembly/shared/mvnlauncher      | 2 +-
 apache-maven/src/assembly/shared/mvnlauncher.cmd  | 2 +-
 apache-maven/src/assembly/shared/mvnwlauncher     | 2 +-
 apache-maven/src/assembly/shared/mvnwlauncher.cmd | 2 +-
 apache-maven/src/assembly/shared/run              | 2 +-
 apache-maven/src/assembly/shared/run.cmd          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apache-maven/src/assembly/shared/mvnlauncher 
b/apache-maven/src/assembly/shared/mvnlauncher
index c523a1d..830f067 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -1,3 +1,3 @@
 LAUNCHER_JAR=`echo "$MAVEN_HOME"/boot/plexus-classworlds-*.jar`
-MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
 
diff --git a/apache-maven/src/assembly/shared/mvnlauncher.cmd 
b/apache-maven/src/assembly/shared/mvnlauncher.cmd
index be2f9a9..567e812 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnlauncher.cmd
@@ -1,3 +1,3 @@
 for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set LAUNCHER_JAR="%%i"
-set MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+set LAUNCHER_CLASS=org.codehaus.plexus.classworlds.launcher.Launcher
 
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher 
b/apache-maven/src/assembly/shared/mvnwlauncher
index 39ba322..3fbd254 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher
+++ b/apache-maven/src/assembly/shared/mvnwlauncher
@@ -1,3 +1,3 @@
 LAUNCHER_JAR="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+LAUNCHER_CLASS=org.apache.maven.wrapper.MavenWrapperMain
 
diff --git a/apache-maven/src/assembly/shared/mvnwlauncher.cmd 
b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
index 46cad98..193db12 100755
--- a/apache-maven/src/assembly/shared/mvnwlauncher.cmd
+++ b/apache-maven/src/assembly/shared/mvnwlauncher.cmd
@@ -1,3 +1,3 @@
 set LAUNCHER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set MAVEN_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+set LAUNCHER_CLASS=org.apache.maven.wrapper.MavenWrapperMain
 
diff --git a/apache-maven/src/assembly/shared/run 
b/apache-maven/src/assembly/shared/run
index 0b2c1bd..69535d6 100755
--- a/apache-maven/src/assembly/shared/run
+++ b/apache-maven/src/assembly/shared/run
@@ -16,4 +16,4 @@ exec "$JAVACMD" \
   "-Dmaven.home=$MAVEN_HOME" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
   "-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
-  $MAVEN_LAUNCHER "$@"
+  $LAUNCHER_CLASS "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd 
b/apache-maven/src/assembly/shared/run.cmd
index 04c1dff..ac526f8 100755
--- a/apache-maven/src/assembly/shared/run.cmd
+++ b/apache-maven/src/assembly/shared/run.cmd
@@ -7,7 +7,7 @@
   "-Dmaven.home=%MAVEN_HOME%" ^
   "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %MAVEN_LAUNCHER% %*
+  %LAUNCHER_CLASS% %*
 if ERRORLEVEL 1 goto error
 goto end