From a846ccb96dc36a0399c9b437dc0dfe7e4349cc8e Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 14 Jan 2021 14:08:16 +0100
Subject: [PATCH] Fix the integration test

---
 .../org/apache/maven/cli/DaemonMavenCli.java   |  3 +++
 .../mvnd/it/ConcurrentDownloadsTest.java       | 18 ++++++++++--------
 .../projects/concurrent-downloads/mod1/pom.xml |  7 ++++---
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index 6a52ddca..e8606040 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -71,6 +71,7 @@ import org.apache.maven.extension.internal.CoreExtensionEntry;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.plugin.ExtensionRealmCache;
+import org.apache.maven.plugin.MavenPluginManager;
 import org.apache.maven.plugin.PluginArtifactsCache;
 import org.apache.maven.plugin.PluginRealmCache;
 import org.apache.maven.project.MavenProject;
@@ -102,6 +103,7 @@ import org.mvndaemon.mvnd.logging.internal.Slf4jLoggerManager;
 import org.mvndaemon.mvnd.logging.smart.BuildEventListener;
 import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener;
 import org.mvndaemon.mvnd.logging.smart.LoggingOutputStream;
+import org.mvndaemon.mvnd.plugin.CliMavenPluginManager;
 import org.mvndaemon.mvnd.transfer.DaemonMavenTransferListener;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
@@ -505,6 +507,7 @@ public class DaemonMavenCli {
                 bind(PluginArtifactsCache.class).to(CliPluginArtifactsCache.class);
                 bind(PluginRealmCache.class).to(CliPluginRealmCache.class);
                 bind(ProjectArtifactsCache.class).to(CliProjectArtifactsCache.class);
+                bind(MavenPluginManager.class).to(CliMavenPluginManager.class);
             }
         });
 
diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
index f96cc1ee..268caeab 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
+++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
@@ -48,14 +48,16 @@ public class ConcurrentDownloadsTest {
         int maxCur = 0;
         int cur = 0;
         for (Message m : o.getMessages()) {
-            if (m.getType() == Message.TRANSFER_STARTED) {
-                if (((Message.TransferEvent) m).getResourceName().contains("apache-camel")) {
-                    cur++;
-                    maxCur = Math.max(cur, maxCur);
-                }
-            } else if (m.getType() == Message.TRANSFER_SUCCEEDED) {
-                if (((Message.TransferEvent) m).getResourceName().contains("apache-camel")) {
-                    cur--;
+            if (m instanceof Message.TransferEvent) {
+                Message.TransferEvent event = (Message.TransferEvent) m;
+                String resource = event.getResourceName();
+                if (resource.contains("apache-camel") || resource.contains("apache-activemq")) {
+                    if (m.getType() == Message.TRANSFER_STARTED) {
+                        cur++;
+                        maxCur = Math.max(cur, maxCur);
+                    } else if (m.getType() == Message.TRANSFER_SUCCEEDED) {
+                        cur--;
+                    }
                 }
             }
         }
diff --git a/integration-tests/src/test/projects/concurrent-downloads/mod1/pom.xml b/integration-tests/src/test/projects/concurrent-downloads/mod1/pom.xml
index b741e7c6..0d102a9e 100644
--- a/integration-tests/src/test/projects/concurrent-downloads/mod1/pom.xml
+++ b/integration-tests/src/test/projects/concurrent-downloads/mod1/pom.xml
@@ -34,9 +34,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.camel</groupId>
-                        <artifactId>apache-camel</artifactId>
-                        <version>3.7.0</version>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>apache-activemq</artifactId>
+                        <version>5.16.0</version>
+                        <classifier>bin</classifier>
                         <type>tar.gz</type>
                         <exclusions>
                             <exclusion>