projects
/
demos
/
spring-boot
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade auf Spring-Boot 3.1.0-M2
[demos/spring-boot]
/
mvnw.cmd
diff --git
a/mvnw.cmd
b/mvnw.cmd
index
c8d4337
..
1d8ab01
100644
(file)
--- a/
mvnw.cmd
+++ b/
mvnw.cmd
@@
-46,8
+46,8
@@
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%
HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%
HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%
USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%
USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
:skipRcPre
@setlocal
:skipRcPre
@setlocal
@@
-120,9
+120,9
@@
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/
io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6
.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/
org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0
.jar"
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "
usebackq
tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
@@
-134,7
+134,7
@@
if exist %WRAPPER_JAR% (
)
) else (
if not "%MVNW_REPOURL%" == "" (
)
) else (
if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/
io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6
.jar"
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/
org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0
.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@
-158,7
+158,13
@@
if exist %WRAPPER_JAR% (
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %WRAPPER_JAR% ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
if ERRORLEVEL 1 goto error
goto end
@@
-168,15
+174,15
@@
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
-if not "%MAVEN_SKIP_RC%"
==
"" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"
==
"" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%
HOME%\mavenrc_post.bat" call "%HOM
E%\mavenrc_post.bat"
-if exist "%
HOME%\mavenrc_post.cmd" call "%HOM
E%\mavenrc_post.cmd"
+if exist "%
USERPROFILE%\mavenrc_post.bat" call "%USERPROFIL
E%\mavenrc_post.bat"
+if exist "%
USERPROFILE%\mavenrc_post.cmd" call "%USERPROFIL
E%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"
==
"on" pause
+if "%MAVEN_BATCH_PAUSE%"
==
"on" pause
-if "%MAVEN_TERMINATE_CMD%"
==
"on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"
==
"on" exit %ERROR_CODE%
-exit /B %ERROR_CODE%
+
cmd /C
exit /B %ERROR_CODE%