Skip to content

Commit 46b38a0

Browse files
committed
Upgrade jline 3.24.1
- Disable jni terminal provider in test ShellAutoConfiguration like it's done for jna/jansi - Default TerminalBuilder system outpu to SysOut to restore writing to stdout instead of stderr when redirect exists - Backport #891 - Backport #901 - Fixes #913 - Fixes #910
1 parent db212a3 commit 46b38a0

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version=3.1.5-SNAPSHOT
22
springBootVersion=3.1.5
33
nativeBuildToolsVersion=0.9.19
44
commonsIoVersion=2.11.0
5-
jlineVersion=3.23.0
5+
jlineVersion=3.24.1
66
st4Version=4.3.3
77
jimfsVersion=1.2
88
gradleEnterpriseVersion=3.10.3

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.jline.reader.Parser;
2222
import org.jline.terminal.Terminal;
2323
import org.jline.terminal.TerminalBuilder;
24+
import org.jline.terminal.TerminalBuilder.SystemOutput;
2425
import org.jline.utils.AttributedString;
2526
import org.jline.utils.AttributedStyle;
2627

@@ -45,6 +46,7 @@ public class JLineShellAutoConfiguration {
4546
public Terminal terminal(ObjectProvider<TerminalCustomizer> customizers) {
4647
try {
4748
TerminalBuilder builder = TerminalBuilder.builder();
49+
builder.systemOutput(SystemOutput.SysOut);
4850
customizers.orderedStream().forEach(customizer -> customizer.customize(builder));
4951
return builder.build();
5052
}

spring-shell-test-autoconfigure/src/main/java/org/springframework/shell/test/autoconfigure/ShellAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ TerminalCustomizer terminalStreamsTerminalCustomizer(TerminalStreams terminalStr
4242
return builder -> {
4343
builder.streams(terminalStreams.input, terminalStreams.output)
4444
.jansi(false)
45-
.jna(false);
45+
.jna(false)
46+
.jni(false);
4647
};
4748
}
4849

0 commit comments

Comments
 (0)