(maven-shared-utils) 01/01: Move to org.jline:jansi

[slachiewicz]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch jline
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git

commit ba32b178c2f8a8de6c6f56336a0b9f904bf9419a
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Wed Apr 30 00:15:50 2025 +0200

    Move to org.jline:jansi
---
 pom.xml                                                     |  4 ++--
 .../maven/shared/utils/logging/AnsiMessageBuilder.java      |  2 +-
 .../org/apache/maven/shared/utils/logging/MessageUtils.java | 11 +++++------
 .../java/org/apache/maven/shared/utils/logging/Style.java   |  4 ++--
 .../apache/maven/shared/utils/logging/MessageUtilsTest.java | 13 +++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b924ad..71cc3f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.fusesource.jansi</groupId>
+      <groupId>org.jline</groupId>
       <artifactId>jansi</artifactId>
-      <version>2.4.1</version>
+      <version>3.29.0</version>
       <optional>true</optional>
     </dependency>
 
diff --git 
a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java 
b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
index ddb9ab7..dca564d 100644
--- 
a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
+++ 
b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
@@ -18,7 +18,7 @@
  */
 package org.apache.maven.shared.utils.logging;
 
-import org.fusesource.jansi.Ansi;
+import org.jline.jansi.Ansi;
 
 /**
  * Message builder implementation that supports ANSI colors through
diff --git 
a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java 
b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
index 7f2f4be..7bd6259 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
@@ -18,15 +18,15 @@
  */
 package org.apache.maven.shared.utils.logging;
 
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.AnsiConsole;
-import org.fusesource.jansi.AnsiMode;
+import org.jline.jansi.Ansi;
+import org.jline.jansi.AnsiConsole;
+import org.jline.jansi.AnsiMode;
 
 /**
  * Colored message utils, to manage colors consistently across plugins (only 
if Maven version is at least 3.5.0).
  * For Maven version before 3.5.0, message built with this util will never add 
color.
  * <p>
- * Internally, <a href="http://fusesource.github.io/jansi/";>Jansi</a> is used 
to render
+ * Internally, <a href="https://jline.org/";>Jansi</a> is used to render
  * <a href="https://en.wikipedia.org/wiki/ANSI_escape_code#Colors";>ANSI 
colors</a> on any platform.
  * @since 3.1.0
  */
@@ -42,8 +42,7 @@ public class MessageUtils {
     static {
         boolean jansi = true;
         try {
-            // Jansi is provided by Maven core since 3.5.0
-            Class.forName("org.fusesource.jansi.Ansi");
+            Class.forName("org.jline.jansi.Ansi");
         } catch (ClassNotFoundException cnfe) {
             jansi = false;
         }
diff --git a/src/main/java/org/apache/maven/shared/utils/logging/Style.java 
b/src/main/java/org/apache/maven/shared/utils/logging/Style.java
index f14b3e0..fe370cc 100644
--- a/src/main/java/org/apache/maven/shared/utils/logging/Style.java
+++ b/src/main/java/org/apache/maven/shared/utils/logging/Style.java
@@ -20,8 +20,8 @@ package org.apache.maven.shared.utils.logging;
 
 import java.util.Locale;
 
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.Ansi.Color;
+import org.jline.jansi.Ansi;
+import org.jline.jansi.Ansi.Color;
 
 /**
  * Configurable message styles.
diff --git 
a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java 
b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
index b95936f..5822cb5 100644
--- a/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
@@ -19,20 +19,20 @@
 package org.apache.maven.shared.utils.logging;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
-import org.fusesource.jansi.AnsiColors;
-import org.fusesource.jansi.AnsiConsole;
-import org.fusesource.jansi.AnsiMode;
-import org.fusesource.jansi.AnsiPrintStream;
-import org.fusesource.jansi.AnsiType;
-import org.fusesource.jansi.io.AnsiOutputStream;
+import org.jline.jansi.*;
+import org.jline.jansi.io.AnsiOutputStream;
+import org.jline.terminal.Size;
+import org.jline.terminal.TerminalBuilder;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.jline.jansi.AnsiConsole.JANSI_PROVIDERS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeNoException;
 
@@ -78,6 +78,7 @@ public class MessageUtilsTest {
                 false);
         try {
             AnsiConsole.systemInstall();
+            // AnsiConsole.out is not available, need to adjust initialization
             AnsiConsole.out = new AnsiPrintStream(aos, true);
             assertEquals(33, MessageUtils.getTerminalWidth());
         } catch (LinkageError e) {