use try-with-resources statement in impl/maven-cli/src/main/java/org/apache/maven/cling/invoker

Author: Vincent Potucek

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java

@@ -473,18 +473,18 @@ public void displayHelp(String command, Consumer<String> pw) {
             pw.accept("");
 
             StringWriter sw = new StringWriter();
-            PrintWriter pw2 = new PrintWriter(sw);
-            formatter.printHelp(
-                    pw2,
-                    width,
-                    commandLineSyntax(command),
-                    System.lineSeparator() + "Options:",
-                    options,
-                    HelpFormatter.DEFAULT_LEFT_PAD,
-                    HelpFormatter.DEFAULT_DESC_PAD,
-                    System.lineSeparator(),
-                    false);
-            pw2.flush();
+            try (PrintWriter writer = new PrintWriter(sw)) {
+                formatter.printHelp(
+                        writer,
+                        width,
+                        commandLineSyntax(command),
+                        System.lineSeparator() + "Options:",
+                        options,
+                        HelpFormatter.DEFAULT_LEFT_PAD,
+                        HelpFormatter.DEFAULT_DESC_PAD,
+                        System.lineSeparator(),
+                        false);
+            }
             for (String s : sw.toString().split(System.lineSeparator())) {
                 pw.accept(s);
             }

impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java

@@ -407,11 +407,7 @@ protected Consumer<String> doDetermineWriter(C context) {
         } else {
             // Given the terminal creation has been offloaded to a different thread,
             // do not pass directly the terminal writer
-            return msg -> {
-                PrintWriter pw = context.terminal.writer();
-                pw.println(msg);
-                pw.flush();
-            };
+            return msg -> context.terminal.writer().println(msg);
         }
     }