From 4d1717456fbb3ef9df3253b5c387141a8ef2b438 Mon Sep 17 00:00:00 2001
From: tibordigana <tibor.digana@gmail.com>
Date: Tue, 4 May 2021 21:54:02 +0200
Subject: [PATCH] https://github.com/quarkusio/quarkus/issues/16195

---
 .../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 18cfa72bde..d95c6a5eb6 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
@@ -1222,7 +1222,6 @@ private SurefireProperties setupProperties()
                                                              getUserProperties(), sysProps );
 
         result.setProperty( "basedir", getBasedir().getAbsolutePath() );
-        result.setProperty( "user.dir", getWorkingDirectory().getAbsolutePath() );
         result.setProperty( "localRepository", getLocalRepository().getBasedir() );
         if ( isForking() )
         {
@@ -1246,10 +1245,16 @@ private SurefireProperties setupProperties()
                         );
             }
         }
+        else
+        {
+            result.setProperty( "user.dir", getWorkingDirectory().getAbsolutePath() );
+        }
+
         if ( getConsoleLogger().isDebugEnabled() )
         {
             showToLog( result, getConsoleLogger() );
         }
+
         return result;
     }