apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2026-01-21 01:14:34 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Run integration tests with an isolated Mavel local repo and settings.xml

Browse Source
This commit is contained in:
Peter Palaga
2020-05-29 10:45:21 +02:00
parent 2706747138
commit ea6079b06b
10 changed files with 244 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Client.java
View File

@@ -25,9 +25,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import java.util.UUID;
import java.util.function.Supplier;
import org.apache.maven.cli.CLIReportingUtils;
import org.jboss.fuse.mvnd.daemon.ClientOutput.TerminalOutput;
@@ -46,6 +46,7 @@ public class Client {
private static final Logger LOGGER = LoggerFactory.getLogger(Client.class);
public static final String DAEMON_DEBUG = "daemon.debug";
private final Layout layout;
private final Optional<ClientLayout> clientLayout;
public static void main(String[] argv) throws Exception {
final List<String> args = new ArrayList<>(Arrays.asList(argv));
@@ -62,12 +63,13 @@ public class Client {
}
try (TerminalOutput output = new TerminalOutput(logFile)) {
new Client(Layout.getEnvInstance()).execute(output, args);
new Client(Layout.getEnvInstance(), Optional.empty()).execute(output, args);
}
}
public Client(Layout layout) {
public Client(Layout layout, Optional<ClientLayout> clientLayout) {
this.layout = layout;
this.clientLayout = clientLayout;
}
public <O extends ClientOutput> ClientResult<O> execute(O output, String... argv) throws IOException {
@@ -88,8 +90,8 @@ public class Client {
try (InputStream is = Client.class.getResourceAsStream("build.properties")) {
props.load(is);
}
String v = buffer().strong( "Maven Daemon " + props.getProperty("version") ).toString()
+ System.getProperty( "line.separator" )
String v = buffer().strong("Maven Daemon " + props.getProperty("version")).toString()
+ System.getProperty("line.separator")
+ CLIReportingUtils.showVersion();
output.log(v);
if (version) {
@@ -129,6 +131,7 @@ public class Client {
}
setDefaultArgs(args);
clientLayout.ifPresent(cl -> clientLayout(cl, args));
DaemonConnector connector = new DaemonConnector(layout, registry, this::startDaemon, new MessageSerializer());
List<String> opts = new ArrayList<>();
@@ -168,6 +171,16 @@ public class Client {
}
static void clientLayout(ClientLayout cl, List<String> args) {
if (!args.stream().anyMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
args.add("-s");
args.add(cl.getSettings().toString());
}
if (!args.stream().anyMatch(arg -> arg.startsWith("-Dmaven.repo.local"))) {
args.add("-Dmaven.repo.local=" + cl.getLocalMavenRepository().toString());
}
}
static void setDefaultArgs(List<String> args) {
if (!args.stream().anyMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
args.add("-T1C");

28
daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ClientLayout.java Normal file
View File

@@ -0,0 +1,28 @@
package org.jboss.fuse.mvnd.daemon;
import java.nio.file.Path;
import java.util.Objects;
/**
* Local paths relevant for the {@link Client}.
*/
public class ClientLayout {
private final Path localMavenRepository;
private final Path settings;
public ClientLayout(Path localMavenRepository, Path settings) {
super();
this.localMavenRepository = Objects.requireNonNull(localMavenRepository, "localMavenRepository");
this.settings = Objects.requireNonNull(settings, "settings");
}
public Path getLocalMavenRepository() {
return localMavenRepository;
}
public Path getSettings() {
return settings;
}
}