Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various upgrades #886

Merged
merged 7 commits into from
Oct 25, 2023
Merged

Various upgrades #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f766ec
Upgrade jansi from 2.4.0 to 2.4.1
gnodet Oct 25, 2023
b93eaeb
Upgrade sshd from 2.9.2 to 2.11.0
gnodet Oct 25, 2023
f138dc1
Upgrade easymock from 5.1.0 to 5.2.0
gnodet Oct 25, 2023
4121043
Upgrade slf4j from 2.0.6 to 2.0.9
gnodet Oct 25, 2023
2e9c4f9
Upgrade graal from 22.3.0 to 23.1.1
gnodet Oct 25, 2023
2579100
Upgrade ivy from 2.5.1 to 2.5.2
gnodet Oct 25, 2023
f9a81e7
Upgrade various plugins
gnodet Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,18 @@
<automatic.module.name />

<jna.version>5.13.0</jna.version>
<jansi.version>2.4.0</jansi.version>
<jansi.version>2.4.1</jansi.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
<sshd.version>2.9.2</sshd.version>
<easymock.version>5.1.0</easymock.version>
<sshd.version>2.11.0</sshd.version>
<easymock.version>5.2.0</easymock.version>
<junit.version>5.10.0</junit.version>
<gogo.runtime.version>1.1.6</gogo.runtime.version>
<gogo.jline.version>1.1.8</gogo.jline.version>
<slf4j.version>2.0.6</slf4j.version>
<slf4j.version>2.0.9</slf4j.version>
<findbugs.version>3.0.2</findbugs.version>
<groovy.version>4.0.13</groovy.version>
<ivy.version>2.5.1</ivy.version>
<graal.version>22.3.0</graal.version>
<ivy.version>2.5.2</ivy.version>
<graal.version>23.1.1</graal.version>
<graal.plugin.version>21.2.0</graal.plugin.version>

<surefire.argLine>--add-opens java.base/java.io=ALL-UNNAMED</surefire.argLine>
Expand Down Expand Up @@ -354,7 +354,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -384,12 +384,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>4.0.0-M9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -438,7 +438,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.2</version>
<version>4.3</version>
<configuration>
<encoding>UTF-8</encoding>
<strictCheck>true</strictCheck>
Expand Down Expand Up @@ -529,7 +529,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>

<plugin>
Expand All @@ -541,7 +541,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.39.0</version>
<version>2.40.0</version>
<configuration>
<java>
<toggleOffOn />
Expand Down Expand Up @@ -751,7 +751,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.13.0</version>
</dependency>
</dependencies>
<executions>
Expand Down
4 changes: 2 additions & 2 deletions terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import java.io.IOException;

import org.fusesource.jansi.WindowsSupport;
import org.fusesource.jansi.internal.Kernel32;
import org.jline.terminal.impl.AbstractWindowsConsoleWriter;

import static org.fusesource.jansi.internal.Kernel32.WriteConsoleW;
Expand All @@ -27,7 +27,7 @@ public JansiWinConsoleWriter(long console) {
@Override
protected void writeConsole(char[] text, int len) throws IOException {
if (WriteConsoleW(console, text, len, writtenChars, 0) == 0) {
throw new IOException("Failed to write to console: " + WindowsSupport.getLastErrorMessage());
throw new IOException("Failed to write to console: " + Kernel32.getLastErrorMessage());
}
}
}
13 changes: 6 additions & 7 deletions terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/WindowsAnsiWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
import java.io.IOException;
import java.io.Writer;

import org.fusesource.jansi.WindowsSupport;
import org.fusesource.jansi.internal.Kernel32.*;
import org.fusesource.jansi.internal.Kernel32;
import org.jline.utils.AnsiWriter;
import org.jline.utils.Colors;

Expand Down Expand Up @@ -82,7 +81,7 @@ public WindowsAnsiWriter(Writer out) throws IOException {
private void getConsoleInfo() throws IOException {
out.flush();
if (GetConsoleScreenBufferInfo(console, info) == 0) {
throw new IOException("Could not get the screen info: " + WindowsSupport.getLastErrorMessage());
throw new IOException("Could not get the screen info: " + Kernel32.getLastErrorMessage());
}
if (negative) {
info.attributes = invertAttributeColors(info.attributes);
Expand All @@ -104,7 +103,7 @@ private void applyAttribute() throws IOException {
attributes = invertAttributeColors(attributes);
}
if (SetConsoleTextAttribute(console, attributes) == 0) {
throw new IOException(WindowsSupport.getLastErrorMessage());
throw new IOException(Kernel32.getLastErrorMessage());
}
}

Expand All @@ -122,7 +121,7 @@ private void applyCursorPosition() throws IOException {
info.cursorPosition.x = (short) Math.max(0, Math.min(info.size.x - 1, info.cursorPosition.x));
info.cursorPosition.y = (short) Math.max(0, Math.min(info.size.y - 1, info.cursorPosition.y));
if (SetConsoleCursorPosition(console, info.cursorPosition.copy()) == 0) {
throw new IOException(WindowsSupport.getLastErrorMessage());
throw new IOException(Kernel32.getLastErrorMessage());
}
}

Expand Down Expand Up @@ -360,7 +359,7 @@ protected void processInsertLine(int optionInt) throws IOException {
info.attributes = originalColors;
info.unicodeChar = ' ';
if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
throw new IOException(WindowsSupport.getLastErrorMessage());
throw new IOException(Kernel32.getLastErrorMessage());
}
}

Expand All @@ -376,7 +375,7 @@ protected void processDeleteLine(int optionInt) throws IOException {
info.attributes = originalColors;
info.unicodeChar = ' ';
if (ScrollConsoleScreenBuffer(console, scroll, scroll, org, info) == 0) {
throw new IOException(WindowsSupport.getLastErrorMessage());
throw new IOException(Kernel32.getLastErrorMessage());
}
}

Expand Down
Loading