From 6a6981cad801550579590bc2907804cc7802932d Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Fri, 29 May 2020 12:26:45 +0200
Subject: [PATCH] Try to disable mrm to see if the itermittent ClassNotFound
 errors disappear in GitHub actions

---
 integration-tests/pom.xml                     | 23 ---------
 .../fuse/mvnd/junit/MvndTestExtension.java    |  5 +-
 .../src/test/resources/settings-template.xml  | 49 +------------------
 3 files changed, 2 insertions(+), 75 deletions(-)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7fddbcd1..11d46520 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -47,34 +47,11 @@
 
     <build>
         <plugins>
-            <!-- mrm-maven-plugin creates a proxy backed by the local Maven repo of the main build -->
-            <!-- Thanks to this, the builds invoked from the tests do not have to download all the dependencies from the Central. -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>mrm-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>mrm-start</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>mrm-stop</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
                         <project.version>${project.version}</project.version>
                         <mvnd.home>${project.basedir}/../daemon/target/maven-distro</mvnd.home>
                     </systemPropertyVariables>
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 b19f450a..2441b6b6 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
@@ -159,10 +159,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
             final Path settingsTemplatePath = Paths.get("src/test/resources/settings-template.xml");
             try {
                 final String template = new String(Files.readAllBytes(settingsTemplatePath), StandardCharsets.UTF_8);
-                /* mrm.repository.url is set by mrm-maven-plugin */
-                final String mrmsRepoUrl = Objects.requireNonNull(System.getProperty("mrm.repository.url"),
-                        "System property mrm.repository.url");
-                final String content = template.replace("${mrm.repository.url}", mrmsRepoUrl);
+                final String content = template;
                 try {
                     Files.write(settingsPath, content.getBytes(StandardCharsets.UTF_8));
                 } catch (Exception e) {
diff --git a/integration-tests/src/test/resources/settings-template.xml b/integration-tests/src/test/resources/settings-template.xml
index ff2b4a59..8e746f82 100644
--- a/integration-tests/src/test/resources/settings-template.xml
+++ b/integration-tests/src/test/resources/settings-template.xml
@@ -1,51 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-    <mirrors>
-        <mirror>
-            <id>mrm-maven-plugin</id>
-            <name>Mock Repository Manager</name>
-            <url>${mrm.repository.url}</url>
-            <mirrorOf>*</mirrorOf>
-        </mirror>
-    </mirrors>
-    <profiles>
-        <profile>
-            <id>it-repo</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>snapshots</id>
-                    <url>${mrm.repository.url}</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                        <updatePolicy>always</updatePolicy>
-                    </snapshots>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>snapshots</id>
-                    <url>${mrm.repository.url}</url>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                        <updatePolicy>never</updatePolicy>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                        <updatePolicy>always</updatePolicy>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
+
 </settings>