diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java index c0b8c50b56f3..37166f7b787b 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java @@ -716,11 +716,6 @@ protected Runnable settings(C context, boolean emitSettingsWarnings, SettingsBui }; } - protected void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest) - throws Exception {} - - protected void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult) throws Exception {} - protected boolean mayDisableInteractiveMode(C context, boolean proposedInteractive) { if (!context.invokerRequest.options().forceInteractive().orElse(false)) { if (context.invokerRequest.options().nonInteractive().orElse(false)) { @@ -936,4 +931,10 @@ protected int calculateDegreeOfConcurrency(String threadConfiguration) { } protected abstract int execute(C context) throws Exception; + + protected abstract void customizeSettingsRequest(C context, SettingsBuilderRequest settingsBuilderRequest) + throws Exception; + + protected abstract void customizeSettingsResult(C context, SettingsBuilderResult settingsBuilderResult) + throws Exception; } diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java index 44b435712eaf..55ff105fef71 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvn/MavenInvoker.java @@ -41,6 +41,8 @@ import org.apache.maven.api.cli.mvn.MavenOptions; import org.apache.maven.api.services.BuilderProblem; import org.apache.maven.api.services.Lookup; +import org.apache.maven.api.services.SettingsBuilderRequest; +import org.apache.maven.api.services.SettingsBuilderResult; import org.apache.maven.api.services.Sources; import org.apache.maven.api.services.ToolchainsBuilder; import org.apache.maven.api.services.ToolchainsBuilderRequest; @@ -92,6 +94,14 @@ protected MavenContext createContext(InvokerRequest invokerRequest) { return new MavenContext(invokerRequest); } + @Override + protected void customizeSettingsRequest(MavenContext context, SettingsBuilderRequest settingsBuilderRequest) + throws Exception {} + + @Override + protected void customizeSettingsResult(MavenContext context, SettingsBuilderResult settingsBuilderResult) + throws Exception {} + @Override protected int execute(MavenContext context) throws Exception { MavenExecutionRequest request = prepareMavenExecutionRequest(); diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/EncryptInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/EncryptInvoker.java index 6ae551a6a4cf..3367a56ff493 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/EncryptInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnenc/EncryptInvoker.java @@ -26,6 +26,8 @@ import org.apache.maven.api.cli.InvokerRequest; import org.apache.maven.api.cli.mvnenc.EncryptOptions; import org.apache.maven.api.services.Lookup; +import org.apache.maven.api.services.SettingsBuilderRequest; +import org.apache.maven.api.services.SettingsBuilderResult; import org.apache.maven.cling.invoker.LookupContext; import org.apache.maven.cling.invoker.LookupInvoker; import org.apache.maven.cling.utils.CLIReportingUtils; @@ -110,6 +112,14 @@ protected int execute(EncryptContext context) throws Exception { } } + @Override + protected void customizeSettingsRequest(EncryptContext context, SettingsBuilderRequest settingsBuilderRequest) + throws Exception {} + + @Override + protected void customizeSettingsResult(EncryptContext context, SettingsBuilderResult settingsBuilderResult) + throws Exception {} + protected int badGoalsErrorMessage(String message, EncryptContext context) { context.logger.error(message); context.logger.error("Supported goals are: " + String.join(", ", context.goals.keySet())); diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnsh/ShellInvoker.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnsh/ShellInvoker.java index 608eeb98b66b..e146a44a4fa5 100644 --- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnsh/ShellInvoker.java +++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnsh/ShellInvoker.java @@ -24,6 +24,8 @@ import org.apache.maven.api.cli.InvokerRequest; import org.apache.maven.api.services.Lookup; +import org.apache.maven.api.services.SettingsBuilderRequest; +import org.apache.maven.api.services.SettingsBuilderResult; import org.apache.maven.cling.invoker.LookupContext; import org.apache.maven.cling.invoker.LookupInvoker; import org.apache.maven.cling.utils.CLIReportingUtils; @@ -197,4 +199,12 @@ protected void commandStyle(LineReader reader, AttributedStringBuilder sb, boole } } } + + @Override + protected void customizeSettingsRequest(LookupContext context, SettingsBuilderRequest settingsBuilderRequest) + throws Exception {} + + @Override + protected void customizeSettingsResult(LookupContext context, SettingsBuilderResult settingsBuilderResult) + throws Exception {} }