From 96a4e701a92bafd015e56a199238f88045f170d1 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Wed, 7 Oct 2020 09:13:44 +0200
Subject: [PATCH] Use takari-local-repository for the main build so that
 mrm-maven-plugin's writes to the local repo are correct

---
 .mvn/extensions.xml                           | 25 +++++++++++++++++++
 integration-tests/pom.xml                     |  9 ++++++-
 .../fuse/mvnd/junit/NativeTestClient.java     |  6 +++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .mvn/extensions.xml

diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000..d382a5d0
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2019 the original author or authors.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<extensions>
+    <extension>
+        <groupId>io.takari.aether</groupId>
+        <artifactId>takari-local-repository</artifactId>
+        <version>0.11.3</version>
+    </extension>
+</extensions>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f358e073..5a9b6286 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -94,14 +94,21 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>mrm-maven-plugin</artifactId>
-                <version>1.2.0</version>
                 <executions>
                     <execution>
+                        <id>mrm-start</id>
                         <phase>process-test-classes</phase>
                         <goals>
                             <goal>start</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>mrm-stop</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
diff --git a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java
index 837d1406..f9d09dde 100644
--- a/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java
+++ b/integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/NativeTestClient.java
@@ -64,6 +64,12 @@ public class NativeTestClient implements Client {
         if (!Environment.MAVEN_REPO_LOCAL.hasCommandLineProperty(args)) {
             cmd.add(Environment.MAVEN_REPO_LOCAL.asCommandLineProperty(layout.getLocalMavenRepository().toString()));
         }
+        final Path settings = layout.getSettings();
+        if (settings != null && args.stream().noneMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
+            cmd.add("-s");
+            cmd.add(settings.toString());
+        }
+
         final ProcessBuilder builder = new ProcessBuilder(cmd.toArray(new String[0]))
                 .directory(layout.userDir().toFile()) //
                 .redirectErrorStream(true);