@@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
46
46
@ REM Execute a user defined script before this one
47
47
if not " %MAVEN_SKIP_RC% " == " " goto skipRcPre
48
48
@ REM check for pre script, once with legacy .bat ending and once with .cmd ending
49
- if exist " %HOME % \mavenrc_pre.bat" call " %HOME % \mavenrc_pre.bat"
50
- if exist " %HOME % \mavenrc_pre.cmd" call " %HOME % \mavenrc_pre.cmd"
49
+ if exist " %USERPROFILE % \mavenrc_pre.bat" call " %USERPROFILE % \mavenrc_pre.bat" %*
50
+ if exist " %USERPROFILE % \mavenrc_pre.cmd" call " %USERPROFILE % \mavenrc_pre.cmd" %*
51
51
:skipRcPre
52
52
53
53
@ setlocal
@@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
120
120
set WRAPPER_JAR = " %MAVEN_PROJECTBASEDIR% \.mvn\wrapper\maven-wrapper.jar"
121
121
set WRAPPER_LAUNCHER = org.apache.maven.wrapper.MavenWrapperMain
122
122
123
- set DOWNLOAD_URL = " https://repo.maven.apache.org/maven2/io/takari /maven-wrapper/0.5.5 /maven-wrapper-0.5.5 .jar"
123
+ set DOWNLOAD_URL = " https://repo.maven.apache.org/maven2/org/apache /maven/wrapper/maven -wrapper/3.1.0 /maven-wrapper-3.1.0 .jar"
124
124
125
- FOR /F " tokens=1,2 delims==" %%A IN (" %MAVEN_PROJECTBASEDIR% \.mvn\wrapper\maven-wrapper.properties" ) DO (
125
+ FOR /F " usebackq tokens=1,2 delims==" %%A IN (" %MAVEN_PROJECTBASEDIR% \.mvn\wrapper\maven-wrapper.properties" ) DO (
126
126
IF " %%A " == " wrapperUrl" SET DOWNLOAD_URL = %%B
127
127
)
128
128
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
134
134
)
135
135
) else (
136
136
if not " %MVNW_REPOURL% " == " " (
137
- SET DOWNLOAD_URL = " %MVNW_REPOURL% /io/takari /maven-wrapper/0.5.5 /maven-wrapper-0.5.5 .jar"
137
+ SET DOWNLOAD_URL = " %MVNW_REPOURL% /org/apache /maven/wrapper/maven -wrapper/3.1.0 /maven-wrapper-3.1.0 .jar"
138
138
)
139
139
if " %MVNW_VERBOSE% " == " true" (
140
140
echo Couldn't find %WRAPPER_JAR% , downloading it ...
@@ -158,7 +158,13 @@ if exist %WRAPPER_JAR% (
158
158
@ REM work with both Windows and non-Windows executions.
159
159
set MAVEN_CMD_LINE_ARGS = %*
160
160
161
- %MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% " -Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR% " %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
161
+ %MAVEN_JAVA_EXE% ^
162
+ %JVM_CONFIG_MAVEN_PROPS% ^
163
+ %MAVEN_OPTS% ^
164
+ %MAVEN_DEBUG_OPTS% ^
165
+ -classpath %WRAPPER_JAR% ^
166
+ " -Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR% " ^
167
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
162
168
if ERRORLEVEL 1 goto error
163
169
goto end
164
170
@@ -168,15 +174,15 @@ set ERROR_CODE=1
168
174
:end
169
175
@ endlocal & set ERROR_CODE = %ERROR_CODE%
170
176
171
- if not " %MAVEN_SKIP_RC% " == " " goto skipRcPost
177
+ if not " %MAVEN_SKIP_RC% " == " " goto skipRcPost
172
178
@ REM check for post script, once with legacy .bat ending and once with .cmd ending
173
- if exist " %HOME % \mavenrc_post.bat" call " %HOME % \mavenrc_post.bat"
174
- if exist " %HOME % \mavenrc_post.cmd" call " %HOME % \mavenrc_post.cmd"
179
+ if exist " %USERPROFILE % \mavenrc_post.bat" call " %USERPROFILE % \mavenrc_post.bat"
180
+ if exist " %USERPROFILE % \mavenrc_post.cmd" call " %USERPROFILE % \mavenrc_post.cmd"
175
181
:skipRcPost
176
182
177
183
@ REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
178
- if " %MAVEN_BATCH_PAUSE% " == " on" pause
184
+ if " %MAVEN_BATCH_PAUSE% " == " on" pause
179
185
180
- if " %MAVEN_TERMINATE_CMD% " == " on" exit %ERROR_CODE%
186
+ if " %MAVEN_TERMINATE_CMD% " == " on" exit %ERROR_CODE%
181
187
182
- exit /B %ERROR_CODE%
188
+ cmd /C exit /B %ERROR_CODE%
0 commit comments