apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-14 22:25:33 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes (#1253)

Browse Source 
Seems MSC fork does not allow pushes from users who have commit rights on forked maven-mvnd, so am incorporating @ascheman changes here as well.

This PR is:
* fixes from PR https://github.com/apache/maven-mvnd/pull/1252
* plus fix SO isse (self injected cache)
* plus migrated whole daemon to Maven DI (from javax.inject) except those that override Sisu components
* ported latest Maven changes
This commit is contained in:
Tamas Cservenak
2025-02-08 19:55:53 +00:00
committed by GitHub
parent 49b7105dad
commit d4d4f23d7d
22 changed files with 109 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.maven.slf4j.MavenSimpleLogger;
import org.apache.maven.api.Constants;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
import org.mvndaemon.mvnd.common.DaemonConnection;
@@ -440,7 +440,7 @@ public class DaemonConnector {
args.add("-Dmaven.conf=" + mvndHome.resolve("mvn").resolve("conf"));
args.add("-Dclassworlds.conf=" + mvndHome.resolve("bin").resolve("mvnd-daemon.conf"));
args.add("-D" + MavenSimpleLogger.LOG_FILE_KEY + "="
args.add("-D" + Constants.MAVEN_LOGGER_LOG_FILE + "="
+ parameters.daemonStorage().resolve("daemon-" + daemonId + ".log"));
Environment.MVND_JAVA_HOME.addSystemProperty(