This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch release/2.22.3 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 8eb5c54d1e2ef1deda5b41a92901513941dbe313 Author: tibordigana <[email protected]> AuthorDate: Tue May 4 21:54:02 2021 +0200 [SUREFIRE-1912] user.dir should not be set lazily within the surefire fork JVM (cherry picked from commit dceea49f62582a2a2820a5fe72e22d65c45f23ed) --- .../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 2e916d8..be4ffea 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -1090,7 +1090,6 @@ public abstract class AbstractSurefireMojo getUserProperties(), sysProps ); result.setProperty( "basedir", getBasedir().getAbsolutePath() ); - result.setProperty( "user.dir", getWorkingDirectory().getAbsolutePath() ); result.setProperty( "localRepository", getLocalRepository().getBasedir() ); if ( isForking() ) { @@ -1114,10 +1113,16 @@ public abstract class AbstractSurefireMojo ); } } + else + { + result.setProperty( "user.dir", getWorkingDirectory().getAbsolutePath() ); + } + if ( getConsoleLogger().isDebugEnabled() ) { showToLog( result, getConsoleLogger() ); } + return result; }
