apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-10 13:15:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the integration test

Browse Source
This commit is contained in:
Guillaume Nodet
2021-01-14 14:08:16 +01:00
parent 3b2efbfead
commit a846ccb96d
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -71,6 +71,7 @@ import org.apache.maven.extension.internal.CoreExtensionEntry;
import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.model.building.ModelProcessor; import org.apache.maven.model.building.ModelProcessor;
import org.apache.maven.plugin.ExtensionRealmCache; import org.apache.maven.plugin.ExtensionRealmCache;
import org.apache.maven.plugin.MavenPluginManager;
import org.apache.maven.plugin.PluginArtifactsCache; import org.apache.maven.plugin.PluginArtifactsCache;
import org.apache.maven.plugin.PluginRealmCache; import org.apache.maven.plugin.PluginRealmCache;
import org.apache.maven.project.MavenProject; 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.BuildEventListener;
import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener; import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener;
import org.mvndaemon.mvnd.logging.smart.LoggingOutputStream; import org.mvndaemon.mvnd.logging.smart.LoggingOutputStream;
import org.mvndaemon.mvnd.plugin.CliMavenPluginManager;
import org.mvndaemon.mvnd.transfer.DaemonMavenTransferListener; import org.mvndaemon.mvnd.transfer.DaemonMavenTransferListener;
import org.slf4j.ILoggerFactory; import org.slf4j.ILoggerFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -505,6 +507,7 @@ public class DaemonMavenCli {
bind(PluginArtifactsCache.class).to(CliPluginArtifactsCache.class); bind(PluginArtifactsCache.class).to(CliPluginArtifactsCache.class);
bind(PluginRealmCache.class).to(CliPluginRealmCache.class); bind(PluginRealmCache.class).to(CliPluginRealmCache.class);
bind(ProjectArtifactsCache.class).to(CliProjectArtifactsCache.class); bind(ProjectArtifactsCache.class).to(CliProjectArtifactsCache.class);
bind(MavenPluginManager.class).to(CliMavenPluginManager.class);
} }
}); });

18
integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
View File

@@ -48,14 +48,16 @@ public class ConcurrentDownloadsTest {
int maxCur = 0; int maxCur = 0;
int cur = 0; int cur = 0;
for (Message m : o.getMessages()) { for (Message m : o.getMessages()) {
if (m.getType() == Message.TRANSFER_STARTED) { if (m instanceof Message.TransferEvent) {
if (((Message.TransferEvent) m).getResourceName().contains("apache-camel")) { Message.TransferEvent event = (Message.TransferEvent) m;
cur++; String resource = event.getResourceName();
maxCur = Math.max(cur, maxCur); if (resource.contains("apache-camel") || resource.contains("apache-activemq")) {
} if (m.getType() == Message.TRANSFER_STARTED) {
} else if (m.getType() == Message.TRANSFER_SUCCEEDED) { cur++;
if (((Message.TransferEvent) m).getResourceName().contains("apache-camel")) { maxCur = Math.max(cur, maxCur);
cur--; } else if (m.getType() == Message.TRANSFER_SUCCEEDED) {
cur--;
}
} }
} }
} }

7
integration-tests/src/test/projects/concurrent-downloads/mod1/pom.xml
View File

@@ -34,9 +34,10 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.camel</groupId> <groupId>org.apache.activemq</groupId>
<artifactId>apache-camel</artifactId> <artifactId>apache-activemq</artifactId>
<version>3.7.0</version> <version>5.16.0</version>
<classifier>bin</classifier>
<type>tar.gz</type> <type>tar.gz</type>
<exclusions> <exclusions>
<exclusion> <exclusion>