MNG-6115: Add Jansi native library search path to our start scripts Prevent writing temp-files to lib/ext/
Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1a79bb3e Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1a79bb3e Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1a79bb3e Branch: refs/heads/MNG-6115 Commit: 1a79bb3edf6f40b3c2cdd74cb3b9e8a98e4fb3f5 Parents: 0b9a30f Author: rfscholte <rfscho...@apache.org> Authored: Sun Feb 26 00:09:43 2017 +0100 Committer: rfscholte <rfscho...@apache.org> Committed: Sun Feb 26 00:09:43 2017 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/1a79bb3e/apache-maven/src/bin/mvn.cmd ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd index c86662b..e57ebbf 100644 --- a/apache-maven/src/bin/mvn.cmd +++ b/apache-maven/src/bin/mvn.cmd @@ -167,6 +167,8 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s :endReadAdditionalConfig +if exist "%MAVEN_HOME%\lib\ext\" set "JANSI_ARGS=-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" + for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i" set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher @@ -178,7 +180,7 @@ set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^ "-Dmaven.home=%MAVEN_HOME%" ^ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\ext" ^ + %JANSI_ARGS% ^ %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end