You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/02/24 16:01:26 UTC
[maven-mvnd] 01/02: Merge remote-tracking branch 'origin/maven4/master' into mvn4
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 6a578cdfb7dd3ae4657b41c66342d531ef00ed4a
Merge: 9ba59f0 9c4dbaf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Feb 21 14:22:25 2022 +0100
Merge remote-tracking branch 'origin/maven4/master' into mvn4
# Conflicts:
# pom.xml
.../mvndaemon/mvnd/client/DaemonParameters.java | 14 +-
.../java/org/apache/maven/cli/DaemonMavenCli.java | 35 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 17 +-
.../maven/model/building/DefaultModelBuilder.java | 1216 --------------------
.../maven/project/CachingProjectBuilder.java | 211 ++--
.../apache/maven/project/SnapshotModelCache.java | 4 +-
.../mvnd/execution/BuildResumptionAnalyzer.java | 52 -
.../mvnd/execution/BuildResumptionData.java | 60 -
.../execution/BuildResumptionDataRepository.java | 72 --
.../BuildResumptionPersistenceException.java | 46 -
.../execution/DefaultBuildResumptionAnalyzer.java | 85 --
.../DefaultBuildResumptionDataRepository.java | 150 ---
.../mvnd/plugin/CachingPluginVersionResolver.java | 11 +
.../mvnd/plugin/CliMavenPluginManager.java | 36 +-
dist/src/main/provisio/maven-distro.xml | 6 +-
pom.xml | 2 +-
16 files changed, 171 insertions(+), 1846 deletions(-)
diff --cc client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index eefdbc7,67adefe..7ba11f9
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@@ -313,19 -309,13 +314,20 @@@ public class DaemonParameters
* @return a new {@link DaemonParameters} with {@code userDir} set to the given {@code newUserDir}
*/
public DaemonParameters cd(Path newUserDir) {
- return derive(b -> b.put(Environment.USER_DIR, newUserDir));
+ return derive(b -> b.put(Environment.USER_DIR, newUserDir)
+ .put(Environment.MAVEN_MULTIMODULE_PROJECT_DIRECTORY, newUserDir));
}
- public DaemonParameters withJdkJavaOpts(String opts) {
+ public DaemonParameters withJdkJavaOpts(String opts, boolean before) {
String org = this.properties.getOrDefault(Environment.JDK_JAVA_OPTIONS.getProperty(), "");
- return derive(b -> b.put(Environment.JDK_JAVA_OPTIONS, org + opts));
+ return derive(b -> b.put(Environment.JDK_JAVA_OPTIONS,
+ org.isEmpty() ? opts : before ? opts + " " + org : org + " " + opts));
+ }
+
+ public DaemonParameters withJvmArgs(String opts, boolean before) {
+ String org = this.properties.getOrDefault(Environment.MVND_JVM_ARGS.getProperty(), "");
+ return derive(b -> b.put(Environment.MVND_JVM_ARGS,
+ org.isEmpty() ? opts : before ? opts + " " + org : org + " " + opts));
}
protected DaemonParameters derive(Consumer<PropertiesBuilder> customizer) {
diff --cc daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index 304779c,bdd5ca6..e99070b
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@@ -98,12 -105,8 +98,9 @@@ import org.mvndaemon.mvnd.cache.invalid
import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginArtifactsCache;
import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginRealmCache;
import org.mvndaemon.mvnd.cache.invalidating.InvalidatingProjectArtifactsCache;
+import org.mvndaemon.mvnd.cli.EnvHelper;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.Os;
- import org.mvndaemon.mvnd.execution.BuildResumptionPersistenceException;
- import org.mvndaemon.mvnd.execution.DefaultBuildResumptionAnalyzer;
- import org.mvndaemon.mvnd.execution.DefaultBuildResumptionDataRepository;
import org.mvndaemon.mvnd.logging.internal.Slf4jLoggerManager;
import org.mvndaemon.mvnd.logging.smart.BuildEventListener;
import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener;
diff --cc pom.xml
index 2951cfe,5dc058f..6799e98
--- a/pom.xml
+++ b/pom.xml
@@@ -53,8 -45,8 +53,8 @@@
<jansi.version>2.4.0</jansi.version>
<jline.version>3.21.0</jline.version>
<junit.jupiter.version>5.7.2</junit.jupiter.version>
- <logback.version>1.2.3</logback.version>
+ <logback.version>1.2.10</logback.version>
- <maven.version>3.8.4</maven.version>
+ <maven.version>4.0.0-alpha-1-SNAPSHOT</maven.version>
<maven.resolver.version>1.7.2</maven.resolver.version>
<slf4j.version>1.7.32</slf4j.version>