diff --git a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java
index 10f8a06ec4f3..e2543bf902d1 100644
--- a/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java
+++ b/impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/CommonsCliOptions.java
@@ -478,18 +478,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);
             }