From eb11f64db7be38daf7ce685cfa6740de9ace2099 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Mon, 4 Jan 2021 17:38:50 +0100
Subject: [PATCH] Yet another workaround for #281

---
 .../mvnd/builder/DependencyGraph.java         |  4 +--
 integration-tests/pom.xml                     |  2 ++
 .../mvnd/junit/MvndTestExtension.java         | 28 ++++++++++++-------
 pom.xml                                       |  3 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
index 5d6e67dd..d185c4f1 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
@@ -375,8 +375,8 @@ public class DependencyGraph<K> {
      * Compute the set of nodes reachable from the given {@code node} through the {@code is upstream of} relation. The
      * {@code node} itself is not a part of the returned set.
      *
-     * @param node the node for which the transitive upstream should be computed
-     * @return the set of transitive upstreams
+     * @param  node the node for which the transitive upstream should be computed
+     * @return      the set of transitive upstreams
      */
     Set<K> transitiveUpstreams(K node) {
         Set<K> result = transitiveUpstreams.get(node);
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f13f4e45..e7c7358a 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -89,6 +89,7 @@
                         <os.detected.arch>${os.detected.arch}</os.detected.arch>
                         <mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
                         <surefire.version>${surefire.version}</surefire.version>
+                        <junit-platform-launcher.version>${junit-platform-launcher.version}</junit-platform-launcher.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
@@ -172,6 +173,7 @@
                                         <os.detected.arch>${os.detected.arch}</os.detected.arch>
                                         <mvnd.test.hostLocalMavenRepo>${settings.localRepository}</mvnd.test.hostLocalMavenRepo>
                                         <surefire.version>${surefire.version}</surefire.version>
+                                        <junit-platform-launcher.version>${junit-platform-launcher.version}</junit-platform-launcher.version>
                                     </systemPropertyVariables>
                                 </configuration>
                             </execution>
diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
index dfb9eec9..77862bd9 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
+++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
@@ -230,20 +230,28 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
         private static void prefillLocalRepo(final Path localMavenRepository) {
             /* Workaround for https://github.com/mvndaemon/mvnd/issues/281 */
             final String surefireVersion = System.getProperty("surefire.version");
+            final String junitPlatformLauncherVersion = System.getProperty("junit-platform-launcher.version");
             final Path hostLocalMavenRepo = Paths.get(System.getProperty("mvnd.test.hostLocalMavenRepo"));
             Stream.of(
-                    "org/apache/maven/surefire/surefire-providers/" + surefireVersion + "/surefire-providers-"
-                            + surefireVersion + ".pom",
-                    "org/apache/maven/surefire/surefire-providers/" + surefireVersion + "/surefire-providers-"
-                            + surefireVersion + ".pom.sha1")
+                    "org/apache/maven/surefire/surefire-providers/" + surefireVersion,
+                    "org/junit/platform/junit-platform-launcher/" + junitPlatformLauncherVersion)
                     .forEach(relPath -> {
                         final Path src = hostLocalMavenRepo.resolve(relPath);
-                        final Path dest = localMavenRepository.resolve(relPath);
-                        try {
-                            Files.createDirectories(dest.getParent());
-                            Files.copy(src, dest);
-                        } catch (IOException e) {
-                            throw new UncheckedIOException(e);
+                        if (Files.isDirectory(src)) {
+                            try (Stream<Path> files = Files.list(src)) {
+                                files.forEach(file -> {
+                                    final Path dest = localMavenRepository.resolve(relPath).resolve(file.getFileName());
+                                    try {
+                                        Files.createDirectories(dest.getParent());
+                                        Files.copy(src, dest);
+                                    } catch (IOException e) {
+                                        throw new UncheckedIOException(e);
+                                    }
+
+                                });
+                            } catch (IOException e) {
+                                throw new UncheckedIOException(e);
+                            }
                         }
                     });
         }
diff --git a/pom.xml b/pom.xml
index 07a11a6b..0377ae19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,8 @@
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
         <maven-install-plugin.version>2.4</maven-install-plugin.version>
         <mrm.version>1.2.0</mrm.version>
-        <surefire.version>2.22.2</surefire.version>
+        <surefire.version>2.22.2</surefire.version><!-- keep in sync with junit-platform-launcher.version -->
+        <junit-platform-launcher.version>1.3.1</junit-platform-launcher.version><!-- keep in sync with surefire.version -->
         <takari-lifecycle.version>1.13.9</takari-lifecycle.version>
         <takari-provisio.version>1.0.15</takari-provisio.version>