10 files changed, 12 insertions, 5 deletions
diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index df61f1b8825..8406f2f1e08 100644
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -23,6 +23,8 @@ dependencies {
   compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
   compileOnlyApi 'com.google.code.gson:gson'
 
+  implementation 'org.apache.commons:commons-exec'
+
   testImplementation 'com.tngtech.java:junit-dataprovider'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java b/sonar-core/src/main/java/org/sonar/core/util/ProcessWrapperFactory.java
index 56e6fd61da3..aa25d7d54c5 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/ProcessWrapperFactory.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/ProcessWrapperFactory.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scm.git;
+package org.sonar.core.util;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -54,7 +54,7 @@ public class ProcessWrapperFactory {
     return new ProcessWrapper(baseDir, stdOutLineConsumer, envVariables, command);
   }
 
-  static class ProcessWrapper {
+  public static class ProcessWrapper {
 
     private final Path baseDir;
     private final Consumer<String> stdOutLineConsumer;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/ProcessWrapperFactoryTest.java b/sonar-core/src/test/java/org/sonar/core/util/ProcessWrapperFactoryTest.java
index 5be38fd898c..4f24ac9eca2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/ProcessWrapperFactoryTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/ProcessWrapperFactoryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scm.git;
+package org.sonar.core.util;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/sonar-scanner-engine/build.gradle b/sonar-scanner-engine/build.gradle
index 2b3313d57f0..287d73e7181 100644
--- a/sonar-scanner-engine/build.gradle
+++ b/sonar-scanner-engine/build.gradle
@@ -26,7 +26,6 @@ dependencies {
   api 'commons-io:commons-io'
   api 'org.apache.commons:commons-lang3'
   implementation 'org.apache.commons:commons-text'
-  implementation 'org.apache.commons:commons-exec'
   api 'com.google.code.gson:gson'
   api 'org.apache.commons:commons-csv'
   api 'com.google.protobuf:protobuf-java'
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmSupport.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmSupport.java
index 162e7f71eff..d8aef57bc2f 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmSupport.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/GitScmSupport.java
@@ -22,6 +22,7 @@ package org.sonar.scm.git;
 import java.util.Arrays;
 import java.util.List;
 import org.eclipse.jgit.util.FS;
+import org.sonar.core.util.ProcessWrapperFactory;
 import org.sonar.scm.git.strategy.DefaultBlameStrategy;
 
 public final class GitScmSupport {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
index d4fc385dcc8..569999a55ab 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scm/git/NativeGitBlameCommand.java
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.scm.BlameLine;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.Version;
+import org.sonar.core.util.ProcessWrapperFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static java.util.Collections.emptyList;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandIT.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandIT.java
index 9f4e0b11e7b..775fe3d05b2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandIT.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandIT.java
@@ -47,6 +47,7 @@ import org.sonar.api.batch.scm.BlameLine;
 import org.sonar.api.notifications.AnalysisWarnings;
 import org.sonar.api.scan.filesystem.PathResolver;
 import org.sonar.api.utils.System2;
+import org.sonar.core.util.ProcessWrapperFactory;
 import org.sonar.scm.git.strategy.DefaultBlameStrategy.BlameAlgorithmEnum;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
index 87c456dbf69..a1a4cae8b4d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/CompositeBlameCommandTest.java
@@ -54,6 +54,7 @@ import org.sonar.api.testfixtures.log.LogTester;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
+import org.sonar.core.util.ProcessWrapperFactory;
 import org.sonar.scm.git.strategy.BlameStrategy;
 import org.sonar.scm.git.strategy.DefaultBlameStrategy.BlameAlgorithmEnum;
 
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
index b7c99187971..058c274013d 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/GitScmProviderTest.java
@@ -61,6 +61,7 @@ import org.sonar.api.testfixtures.log.LogTester;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.System2;
 import org.sonar.core.documentation.DocumentationLinkGenerator;
+import org.sonar.core.util.ProcessWrapperFactory;
 import org.sonar.scm.git.strategy.DefaultBlameStrategy;
 
 import static java.lang.String.format;
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/NativeGitBlameCommandTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/NativeGitBlameCommandTest.java
index ba33e8d420a..68b7e1b7bd2 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scm/git/NativeGitBlameCommandTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scm/git/NativeGitBlameCommandTest.java
@@ -40,7 +40,8 @@ import org.sonar.api.batch.scm.BlameLine;
 import org.sonar.api.testfixtures.log.LogTesterJUnit5;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.System2;
-import org.sonar.scm.git.ProcessWrapperFactory.ProcessWrapper;
+import org.sonar.core.util.ProcessWrapperFactory;
+import org.sonar.core.util.ProcessWrapperFactory.ProcessWrapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;