[MNG-8305] Fix MER showErrors setting (#1795)

cstamas · web-flow · commit 7df5b16f7807 · 2024-10-14T19:33:06.000+02:00
--- https://issues.apache.org/jira/browse/MNG-8305
diff --git a/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/Options.java b/api/maven-api-cli/src/main/java/org/apache/maven/api/cli/Options.java
@@ -87,7 +87,7 @@ public interface Options {
     Optional<Boolean> verbose();
 
     /**
-     * Indicates whether to show error messages.
+     * Indicates whether to show error stack traces.
      *
      * @return an {@link Optional} containing the boolean flag, or empty if not set
      */
diff --git a/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java b/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java
@@ -97,7 +97,7 @@ public Optional<Boolean> verbose() {
 
     @Override
     public Optional<Boolean> showErrors() {
-        if (commandLine.hasOption(CLIManager.SHOW_ERRORS)) {
+        if (commandLine.hasOption(CLIManager.SHOW_ERRORS) || verbose().orElse(false)) {
             return Optional.of(Boolean.TRUE);
         }
         return Optional.empty();

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public interface Options {`
`87`	`87`	`Optional<Boolean> verbose();`
`88`	`88`
`89`	`89`	`/**`
`90`		`- * Indicates whether to show error messages.`
	`90`	`+ * Indicates whether to show error stack traces.`
`91`	`91`	`*`
`92`	`92`	`* @return an {@link Optional} containing the boolean flag, or empty if not set`
`93`	`93`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public Optional<Boolean> verbose() {`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public Optional<Boolean> showErrors() {`
`100`		`- if (commandLine.hasOption(CLIManager.SHOW_ERRORS)) {`
	`100`	`+ if (commandLine.hasOption(CLIManager.SHOW_ERRORS) \|\| verbose().orElse(false)) {`
`101`	`101`	`return Optional.of(Boolean.TRUE);`
`102`	`102`	`}`
`103`	`103`	`return Optional.empty();`