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

Merge pull request #81 from gnodet/improvements

Browse Source 
Improvements
This commit is contained in:
Guillaume Nodet
2020-10-05 12:56:31 +02:00
committed by GitHub
parent c3cbb91ea3 6a00419c38
commit 72b164bfbb
7 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/pom.xml
View File

@@ -40,6 +40,10 @@
<groupId>org.jboss.fuse.mvnd</groupId> <groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-common</artifactId> <artifactId>mvnd-common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.graalvm.nativeimage</groupId> <groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId> <artifactId>svm</artifactId>

10
client/src/main/java/org/jboss/fuse/mvnd/client/DefaultClient.java
View File

@@ -66,7 +66,7 @@ public class DefaultClient implements Client {
} }
try (TerminalOutput output = new TerminalOutput(logFile)) { try (TerminalOutput output = new TerminalOutput(logFile)) {
new DefaultClient(() -> ClientLayout.getEnvInstance(), BuildProperties.getInstance()).execute(output, args); new DefaultClient(ClientLayout::getEnvInstance, BuildProperties.getInstance()).execute(output, args);
} }
} }
@@ -169,7 +169,7 @@ public class DefaultClient implements Client {
setDefaultArgs(args); setDefaultArgs(args);
final Path settings = layout.getSettings(); final Path settings = layout.getSettings();
if (settings != null && !args.stream().anyMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) { if (settings != null && args.stream().noneMatch(arg -> arg.equals("-s") || arg.equals("--settings"))) {
args.add("-s"); args.add("-s");
args.add(settings.toString()); args.add(settings.toString());
} }
@@ -220,15 +220,15 @@ public class DefaultClient implements Client {
} }
static void setDefaultArgs(List<String> args) { static void setDefaultArgs(List<String> args) {
if (!args.stream().anyMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) { if (args.stream().noneMatch(arg -> arg.startsWith("-T") || arg.equals("--threads"))) {
args.add("-T1C"); args.add("-T1C");
} }
if (!args.stream().anyMatch(arg -> arg.startsWith("-b") || arg.equals("--builder"))) { if (args.stream().noneMatch(arg -> arg.startsWith("-b") || arg.equals("--builder"))) {
args.add("-bsmart"); args.add("-bsmart");
} }
} }
private class DefaultResult implements ExecutionResult { private static class DefaultResult implements ExecutionResult {
private final Exception exception; private final Exception exception;
private final List<String> args; private final List<String> args;

2
common/pom.xml
View File

@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>

3
daemon/src/main/provisio/maven-distro.xml
View File

@@ -60,6 +60,9 @@
<exclusion id="*:plexus-sec-dispatcher"/> <exclusion id="*:plexus-sec-dispatcher"/>
<exclusion id="*:plexus-utils"/> <exclusion id="*:plexus-utils"/>
</artifact> </artifact>
<artifact id="org.jboss.fuse.mvnd:mvnd-client:${project.version}">
<exclusion id="*:slf4j-simple"/>
</artifact>
</artifactSet> </artifactSet>
<fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}"> <fileSet to="mvnd-${project.version}-${os.detected.name}-${os.detected.arch}">

6
integration-tests/pom.xml
View File

@@ -60,6 +60,12 @@
<groupId>org.jboss.fuse.mvnd</groupId> <groupId>org.jboss.fuse.mvnd</groupId>
<artifactId>mvnd-client</artifactId> <artifactId>mvnd-client</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>

1
integration-tests/src/test/java/org/jboss/fuse/mvnd/junit/MvndTestExtension.java
View File

@@ -144,6 +144,7 @@ public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback,
throw new IllegalStateException("rawProjectDir of @MvndTest must be set"); throw new IllegalStateException("rawProjectDir of @MvndTest must be set");
} }
final Path testDir = Paths.get("target/mvnd-tests/" + className).toAbsolutePath(); final Path testDir = Paths.get("target/mvnd-tests/" + className).toAbsolutePath();
deleteDir(testDir);
Files.createDirectories(testDir); Files.createDirectories(testDir);
final Path testExecutionDir; final Path testExecutionDir;
if (TEMP_EXTERNAL.equals(rawProjectDir)) { if (TEMP_EXTERNAL.equals(rawProjectDir)) {

5
pom.xml
View File

@@ -76,6 +76,11 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>${logback.version}</version> <version>${logback.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>