Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade jline 3.24.1

Browse Source 
- 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 #914
- Fixes #911
This commit is contained in:
Janne Valkealahti
2023-11-03 17:11:48 +00:00
parent 5105f5cd37
commit ae6fbdcc5a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ version=3.0.9-SNAPSHOT
springBootVersion=3.0.12 springBootVersion=3.0.12
nativeBuildToolsVersion=0.9.19 nativeBuildToolsVersion=0.9.19
commonsIoVersion=2.11.0 commonsIoVersion=2.11.0
jlineVersion=3.23.0 jlineVersion=3.24.1
st4Version=4.3.3 st4Version=4.3.3
jimfsVersion=1.2 jimfsVersion=1.2
gradleEnterpriseVersion=3.10.3 gradleEnterpriseVersion=3.10.3

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

@@ -21,6 +21,7 @@ import java.io.IOException;
import org.jline.reader.Parser; import org.jline.reader.Parser;
import org.jline.terminal.Terminal; import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder; import org.jline.terminal.TerminalBuilder;
import org.jline.terminal.TerminalBuilder.SystemOutput;
import org.jline.utils.AttributedString; import org.jline.utils.AttributedString;
import org.jline.utils.AttributedStyle; import org.jline.utils.AttributedStyle;
@@ -45,6 +46,7 @@ public class JLineShellAutoConfiguration {
public Terminal terminal(ObjectProvider<TerminalCustomizer> customizers) { public Terminal terminal(ObjectProvider<TerminalCustomizer> customizers) {
try { try {
TerminalBuilder builder = TerminalBuilder.builder(); TerminalBuilder builder = TerminalBuilder.builder();
builder.systemOutput(SystemOutput.SysOut);
customizers.orderedStream().forEach(customizer -> customizer.customize(builder)); customizers.orderedStream().forEach(customizer -> customizer.customize(builder));
return builder.build(); return builder.build();
} }

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

@@ -42,7 +42,8 @@ public class ShellAutoConfiguration {
return builder -> { return builder -> {
builder.streams(terminalStreams.input, terminalStreams.output) builder.streams(terminalStreams.input, terminalStreams.output)
.jansi(false) .jansi(false)
.jna(false); .jna(false)
.jni(false);
}; };
} }