From 3f766ecfaf819395fe16d4e88a7c1720d61e995e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:55:21 +0200 Subject: [PATCH 1/7] Upgrade jansi from 2.4.0 to 2.4.1 --- pom.xml | 2 +- .../impl/jansi/win/JansiWinConsoleWriter.java | 4 ++-- .../terminal/impl/jansi/win/WindowsAnsiWriter.java | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index f8c6af67a..d0ab46f3c 100644 --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ 5.13.0 - 2.4.0 + 2.4.1 1.0.3 2.9.2 5.1.0 diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java index 51bad1dcb..6a4811d05 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinConsoleWriter.java @@ -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; @@ -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()); } } } diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/WindowsAnsiWriter.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/WindowsAnsiWriter.java index 5418f41a9..3e9155d23 100644 --- a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/WindowsAnsiWriter.java +++ b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/WindowsAnsiWriter.java @@ -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; @@ -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); @@ -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()); } } @@ -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()); } } @@ -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()); } } @@ -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()); } } From b93eaeb7fa0a09a906909683491169f617841e1c Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:57:31 +0200 Subject: [PATCH 2/7] Upgrade sshd from 2.9.2 to 2.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0ab46f3c..3c5a39643 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ 5.13.0 2.4.1 1.0.3 - 2.9.2 + 2.11.0 5.1.0 5.10.0 1.1.6 From f138dc1c1a89744bb8666e3bebd8cccc318b9ea6 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:57:49 +0200 Subject: [PATCH 3/7] Upgrade easymock from 5.1.0 to 5.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c5a39643..7331ac812 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ 2.4.1 1.0.3 2.11.0 - 5.1.0 + 5.2.0 5.10.0 1.1.6 1.1.8 From 4121043d7d60fe9a7c2b48a4deaecd5b2c7d1e45 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:58:06 +0200 Subject: [PATCH 4/7] Upgrade slf4j from 2.0.6 to 2.0.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7331ac812..ecbbf2e88 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ 5.10.0 1.1.6 1.1.8 - 2.0.6 + 2.0.9 3.0.2 4.0.13 2.5.1 From 2e9c4f907191068f6a3686ac11e37ced115b0638 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:59:16 +0200 Subject: [PATCH 5/7] Upgrade graal from 22.3.0 to 23.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ecbbf2e88..1dc3803b3 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.0.2 4.0.13 2.5.1 - 22.3.0 + 23.1.1 21.2.0 --add-opens java.base/java.io=ALL-UNNAMED From 2579100f03036af57c34d3b85f87d2264f6d1c03 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 16:59:51 +0200 Subject: [PATCH 6/7] Upgrade ivy from 2.5.1 to 2.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1dc3803b3..6d2a59678 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 2.0.9 3.0.2 4.0.13 - 2.5.1 + 2.5.2 23.1.1 21.2.0 From f9a81e7eeaba90b2bf39e1d725648fa5faf7e4ba Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Wed, 25 Oct 2023 17:00:19 +0200 Subject: [PATCH 7/7] Upgrade various plugins --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6d2a59678..5b0e3500a 100644 --- a/pom.xml +++ b/pom.xml @@ -354,7 +354,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins @@ -384,12 +384,12 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + 4.0.0-M9 org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.1 org.apache.felix @@ -438,7 +438,7 @@ com.mycila license-maven-plugin - 4.2 + 4.3 UTF-8 true @@ -529,7 +529,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 @@ -541,7 +541,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.39.0 + 2.40.0 @@ -751,7 +751,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.13.0