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

Port mvnsh changes (#1228)

Browse Source 
Basically get rid of ResidentContext, is gone.
Also, port some other minor mvn RC-3 changes as well.
This commit is contained in:
Tamas Cservenak
2024-12-17 13:54:57 +01:00
committed by GitHub
parent 7b309de9ab
commit 7820fcc20c
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/src/main/java/org/apache/maven/cli/DaemonMavenInvoker.java
View File

@@ -27,7 +27,7 @@ import org.apache.maven.api.cli.InvokerRequest;
import org.apache.maven.api.cli.Options;
import org.apache.maven.cling.invoker.ContainerCapsuleFactory;
import org.apache.maven.cling.invoker.ProtoLookup;
import org.apache.maven.cling.invoker.mvn.resident.ResidentMavenContext;
import org.apache.maven.cling.invoker.mvn.MavenContext;
import org.apache.maven.cling.invoker.mvn.resident.ResidentMavenInvoker;
import org.apache.maven.cling.utils.CLIReportingUtils;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -44,7 +44,7 @@ public class DaemonMavenInvoker extends ResidentMavenInvoker {
}
@Override
protected void createTerminal(ResidentMavenContext context) {
protected void createTerminal(MavenContext context) {
MessageUtils.systemInstall(
builder -> {
builder.streams(
@@ -66,7 +66,7 @@ public class DaemonMavenInvoker extends ResidentMavenInvoker {
}
@Override
protected void doConfigureWithTerminal(ResidentMavenContext context, Terminal terminal) {
protected void doConfigureWithTerminal(MavenContext context, Terminal terminal) {
super.doConfigureWithTerminal(context, terminal);
Optional<Boolean> rawStreams = context.invokerRequest.options().rawStreams();
if (rawStreams.orElse(false)) {
@@ -86,12 +86,12 @@ public class DaemonMavenInvoker extends ResidentMavenInvoker {
}
@Override
protected org.apache.maven.logging.BuildEventListener doDetermineBuildEventListener(ResidentMavenContext context) {
protected org.apache.maven.logging.BuildEventListener doDetermineBuildEventListener(MavenContext context) {
return context.invokerRequest.lookup().lookup(BuildEventListener.class);
}
@Override
protected void helpOrVersionAndMayExit(ResidentMavenContext context) throws Exception {
protected void helpOrVersionAndMayExit(MavenContext context) throws Exception {
InvokerRequest invokerRequest = context.invokerRequest;
BuildEventListener buildEventListener =
context.invokerRequest.parserRequest().lookup().lookup(BuildEventListener.class);
@@ -110,7 +110,7 @@ public class DaemonMavenInvoker extends ResidentMavenInvoker {
}
@Override
protected void preCommands(ResidentMavenContext context) throws Exception {
protected void preCommands(MavenContext context) throws Exception {
Options mavenOptions = context.invokerRequest.options();
if (mavenOptions.verbose().orElse(false) || mavenOptions.showVersion().orElse(false)) {
context.invokerRequest
@@ -122,12 +122,12 @@ public class DaemonMavenInvoker extends ResidentMavenInvoker {
}
@Override
protected ContainerCapsuleFactory<ResidentMavenContext> createContainerCapsuleFactory() {
protected ContainerCapsuleFactory<MavenContext> createContainerCapsuleFactory() {
return new DaemonPlexusContainerCapsuleFactory();
}
@Override
protected int doExecute(ResidentMavenContext context, MavenExecutionRequest request) throws Exception {
protected int doExecute(MavenContext context, MavenExecutionRequest request) throws Exception {
context.logger.info(MessageUtils.builder()
.a("Processing build on daemon ")
.strong(Environment.MVND_ID.asString())

2
daemon/src/main/java/org/apache/maven/cli/DaemonMessageBuilderFactory.java
View File

@@ -18,12 +18,12 @@
*/
package org.apache.maven.cli;
import javax.annotation.Priority;
import javax.inject.Named;
import javax.inject.Singleton;
import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.jline.JLineMessageBuilderFactory;
import org.eclipse.sisu.Priority;
import org.mvndaemon.mvnd.common.Environment;
@Named

6
daemon/src/main/java/org/apache/maven/cli/DaemonPlexusContainerCapsuleFactory.java
View File

@@ -26,11 +26,11 @@ import java.util.Set;
import java.util.stream.Stream;
import org.apache.maven.cling.invoker.PlexusContainerCapsuleFactory;
import org.apache.maven.cling.invoker.mvn.resident.ResidentMavenContext;
import org.apache.maven.cling.invoker.mvn.MavenContext;
import org.apache.maven.extension.internal.CoreExtensionEntry;
import org.mvndaemon.mvnd.common.Environment;
public class DaemonPlexusContainerCapsuleFactory extends PlexusContainerCapsuleFactory<ResidentMavenContext> {
public class DaemonPlexusContainerCapsuleFactory extends PlexusContainerCapsuleFactory<MavenContext> {
@Override
protected Set<String> collectExportedArtifacts(
@@ -50,7 +50,7 @@ public class DaemonPlexusContainerCapsuleFactory extends PlexusContainerCapsuleF
}
@Override
protected List<Path> parseExtClasspath(ResidentMavenContext context) throws Exception {
protected List<Path> parseExtClasspath(MavenContext context) throws Exception {
return Stream.of(Environment.MVND_EXT_CLASSPATH.asString().split(","))
.filter(s -> s != null && !s.isEmpty())
.map(Paths::get)