From 2f27012fd2ef9f6b85a90529da375316b1490229 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 5 Oct 2020 12:32:41 +0200
Subject: [PATCH 1/3] Delete the test directory so that we can run "mvn
 install" without cleaning

---
 .../test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
index 7324a130..eb9d96af 100644
--- a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
+++ b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
@@ -144,6 +144,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
                 throw new IllegalStateException("rawProjectDir of @MvndTest must be set");
             }
             final Path testDir = Paths.get("target/mvnd-tests/" + className).toAbsolutePath();
+            deleteDir(testDir);
             Files.createDirectories(testDir);
             final Path testExecutionDir;
             if (TEMP_EXTERNAL.equals(rawProjectDir)) {

From b9e44f5902409e463ee69f6b8bb378ba632bb72a Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 5 Oct 2020 12:34:00 +0200
Subject: [PATCH 2/3] Replace the mvnd-common dependency from slf4j-simple to
 slf4j-api

---
 client/pom.xml                            | 4 ++++
 common/pom.xml                            | 2 +-
 daemon/src/main/provisio/maven-distro.xml | 3 +++
 integration-tests/pom.xml                 | 6 ++++++
 pom.xml                                   | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/client/pom.xml b/client/pom.xml
index 419e8008..d7d3e4cd 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -40,6 +40,10 @@
             <groupId>org.jboss.fuse.mvnd</groupId>
             <artifactId>mvnd-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index f753d92c..00d4819c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/daemon/src/main/provisio/maven-distro.xml b/daemon/src/main/provisio/maven-distro.xml
index ace3e064..f8555d23 100644
--- a/daemon/src/main/provisio/maven-distro.xml
+++ b/daemon/src/main/provisio/maven-distro.xml
@@ -60,6 +60,9 @@
             <exclusion id="*:plexus-sec-dispatcher"/>
             <exclusion id="*:plexus-utils"/>
         </artifact>
+        <artifact id="org.jboss.fuse.mvnd:mvnd-client:${project.version}">
+            <exclusion id="*:slf4j-simple"/>
+        </artifact>
     </artifactSet>
 
     <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 3ba85302..4aeba407 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -60,6 +60,12 @@
             <groupId>org.jboss.fuse.mvnd</groupId>
             <artifactId>mvnd-client</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index ab29a8ee..603a8e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,11 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>

From 6a00419c38f53554071e02461bc6feb04f5f9aec Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Mon, 5 Oct 2020 12:34:29 +0200
Subject: [PATCH 3/3] Minor improvements

---
 .../java/org/jboss/fuse/mvnd/client/DefaultClient.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
index 905cf5bb..cd222639 100644
--- a/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
+++ b/client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
@@ -66,7 +66,7 @@ public class DefaultClient implements Client {
         }
 
         try (TerminalOutput output = new TerminalOutput(logFile)) {
-            new DefaultClient(() -> ClientLayout.getEnvInstance(), BuildProperties.getInstance()).execute(output, args);
+            new DefaultClient(ClientLayout::getEnvInstance, BuildProperties.getInstance()).execute(output, args);
         }
     }
 
@@ -169,7 +169,7 @@ public class DefaultClient implements Client {
 
             setDefaultArgs(args);
             final Path settings = layout.getSettings();
-            if (settings != null && !args.stream().anyMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
+            if (settings != null && args.stream().noneMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
                 args.add("-s");
                 args.add(settings.toString());
             }
@@ -220,15 +220,15 @@ public class DefaultClient implements Client {
     }
 
     static void setDefaultArgs(List<String> args) {
-        if (!args.stream().anyMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
+        if (args.stream().noneMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
             args.add("-T1C");
         }
-        if (!args.stream().anyMatch(arg -> arg.startsWith("-b") || arg.equals("--builder"))) {
+        if (args.stream().noneMatch(arg -> arg.startsWith("-b") || arg.equals("--builder"))) {
             args.add("-bsmart");
         }
     }
 
-    private class DefaultResult implements ExecutionResult {
+    private static class DefaultResult implements ExecutionResult {
 
         private final Exception exception;
         private final List<String> args;