From 1f4eb5b02e552045b00f1bdbce814287f6b3d522 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Fri, 3 Nov 2023 17:17:44 +0000
Subject: [PATCH] Upgrade jline 3.24.1

- Default TerminalBuilder system outpu to SysOut to restore
  writing to stdout instead of stderr when redirect exists
- Backport #891
- Backport #901
- Fixes #915
- Fixes #912
---
 pom.xml                                                        | 2 +-
 .../shell/boot/JLineShellAutoConfiguration.java                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34100c87d..99faac5c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	</scm>
 
 	<properties>
-		<jline.version>3.23.0</jline.version>
+		<jline.version>3.24.1</jline.version>
 		<antlr-st4.version>4.3.3</antlr-st4.version>
 		<jimfs.version>1.2</jimfs.version>
 	</properties>
diff --git a/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java b/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java
index b918a4381..92d1ac26b 100644
--- a/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java
+++ b/spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java
@@ -21,6 +21,7 @@
 import org.jline.reader.Parser;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
+import org.jline.terminal.TerminalBuilder.SystemOutput;
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStyle;
 
@@ -43,7 +44,7 @@ public class JLineShellAutoConfiguration {
 	@Bean(destroyMethod = "close")
 	public Terminal terminal() {
 		try {
-			return TerminalBuilder.builder().build();
+			return TerminalBuilder.builder().systemOutput(SystemOutput.SysOut).build();
 		}
 		catch (IOException e) {
 			throw new BeanCreationException("Could not create Terminal: " + e.getMessage());