Skip to content

Commit

Permalink
Upgrade jline 3.24.1
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
jvalkeal committed Nov 3, 2023
1 parent 5105f5c commit ae6fbdc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version=3.0.9-SNAPSHOT
springBootVersion=3.0.12
nativeBuildToolsVersion=0.9.19
commonsIoVersion=2.11.0
jlineVersion=3.23.0
jlineVersion=3.24.1
st4Version=4.3.3
jimfsVersion=1.2
gradleEnterpriseVersion=3.10.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -45,6 +46,7 @@ public class JLineShellAutoConfiguration {
public Terminal terminal(ObjectProvider<TerminalCustomizer> customizers) {
try {
TerminalBuilder builder = TerminalBuilder.builder();
builder.systemOutput(SystemOutput.SysOut);
customizers.orderedStream().forEach(customizer -> customizer.customize(builder));
return builder.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ TerminalCustomizer terminalStreamsTerminalCustomizer(TerminalStreams terminalStr
return builder -> {
builder.streams(terminalStreams.input, terminalStreams.output)
.jansi(false)
.jna(false);
.jna(false)
.jni(false);
};
}

Expand Down

0 comments on commit ae6fbdc

Please sign in to comment.