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

mvnd ignores the .mvn/jvm.config file , fixes #348

Browse Source
This commit is contained in:
Guillaume Nodet
2021-02-15 09:08:36 +01:00
parent 5fea58611b
commit c85f2ea285
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
View File

@@ -34,6 +34,8 @@ import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.maven.shared.utils.StringUtils;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
import org.mvndaemon.mvnd.common.DaemonConnection;
@@ -342,6 +344,14 @@ public class DaemonConnector {
}
}
}
// .mvn/jvm.config
if (Files.isRegularFile(parameters.jvmConfigPath())) {
Files.lines(parameters.jvmConfigPath())
.flatMap(l -> Stream.of(l.split(" ")))
.map(String::trim)
.filter(StringUtils::isNotEmpty)
.forEach(args::add);
}
// memory
String minHeapSize = parameters.minHeapSize();
if (minHeapSize != null) {

4
client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
View File

@@ -166,6 +166,10 @@ public class DaemonParameters {
.asPath();
}
public Path jvmConfigPath() {
return multiModuleProjectDirectory().resolve(".mvn/jvm.config");
}
public Path localPropertiesPath() {
return multiModuleProjectDirectory().resolve(".mvn/mvnd.properties");
}