From f261dc6018f8e643cea70bc118bd410021d3fd70 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Wed, 10 Jul 2024 14:38:41 +0100
Subject: [PATCH 1/5] Update JLine to 3.26.1

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index cf599ffe737..86f8c44033c 100644
--- 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.1</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>

From ad8eb382a71f7f284b728084b57361dcaf470850 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:35:55 +0100
Subject: [PATCH 2/5] Update JLine to 3.26.3

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index 86f8c44033c..0656bb7177f 100644
--- 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.26.1</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>

From 5a5401b84b64e5824d5347e8d7612ae3c9bb9eeb Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:36:21 +0100
Subject: [PATCH 3/5] Prevent illegal reflection warning.

---
 .../src/main/java/com/sun/enterprise/admin/cli/CLICommand.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 46908a8f17f..c398ebb28bd 100644
--- 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
@@ -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("org.jline.terminal.exec.redirectPipeCreationMode", "native");
+                terminal = TerminalBuilder.builder()
                     .system(true)
                     .build();
             }

From 3dfcc1832e7d272ed643642e1854bd104a186e04 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:58:48 +0100
Subject: [PATCH 4/5] Use constants instead of string literals.

Co-authored-by: Andrew Pielage <pandrex247@hotmail.com>
---
 .../src/main/java/com/sun/enterprise/admin/cli/CLICommand.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index c398ebb28bd..fd0c5e92ce2 100644
--- 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
@@ -1429,7 +1429,7 @@ private static void file2Set(String file, Set<String> set) {
     protected void buildTerminal() {
         try {
             if (terminal == null) {
-                System.setProperty("org.jline.terminal.exec.redirectPipeCreationMode", "native");
+                System.setProperty(TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE, TerminalBuilder.PROP_REDIRECT_PIPE_CREATION_MODE_NATIVE);
                 terminal = TerminalBuilder.builder()
                     .system(true)
                     .build();

From 621a1e423627ff69a819346f1c18d85795ac6f2d Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:23:42 +0100
Subject: [PATCH 5/5] Update copyright header.

---
 .../src/main/java/com/sun/enterprise/admin/cli/CLICommand.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index fd0c5e92ce2..81ca1d832d3 100644
--- 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;