Merge pull request #6827 from Viii3/FISH-8557-Community6-Upgrade-JLine

FISH-8557 Upgrade JLine to 3.26.3
payara · Jul 19, 2024 · 0d528d3 · 0d528d3
2 parents a0179c8 + 621a1e4
commit 0d528d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -130,7 +130,7 @@
         <junit.version>4.13.2</junit.version>
         <mockito.version>2.28.2</mockito.version>
         <logging-annotation-processor.version>1.9</logging-annotation-processor.version>
-        <jline.version>3.21.0</jline.version>
+        <jline.version>3.26.3</jline.version>
         <grizzly.npn.api.version>2.0.0.payara-p1</grizzly.npn.api.version>
         <tiger.types.version>1.4.payara-p1</tiger.types.version>
         <mimepull.version>1.10.0</mimepull.version>

diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/CLICommand.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2018-2021] Payara Foundation and/or affiliates
+// Portions Copyright [2018-2024] Payara Foundation and/or affiliates
 
 package com.sun.enterprise.admin.cli;
 
@@ -1429,7 +1429,8 @@ private static void file2Set(String file, Set<String> set) {
     protected void buildTerminal() {
         try {
             if (terminal == null) {
-            terminal = TerminalBuilder.builder()
+                System.setProperty(TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE, TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE);
+                terminal = TerminalBuilder.builder()
                     .system(true)
                     .build();
             }