Skip to content

Move off from deprecated library #371

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

Closed
cstamas wants to merge 1 commit into from
Closed

Move off from deprecated library #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
</dependency>

<dependency>
<groupId>org.fusesource.jansi</groupId>
<groupId>org.jline</groupId>
<artifactId>jansi</artifactId>
<version>2.4.2</version>
<version>3.30.8</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/apache/maven/shared/utils/logging/MessageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*/
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).
Expand All @@ -44,7 +44,7 @@ public class MessageUtils {
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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/apache/maven/shared/utils/logging/Style.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

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.
Expand Down
20 changes: 11 additions & 9 deletions src/test/java/org/apache/maven/shared/utils/logging/MessageUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.lang.reflect.Field;
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.AnsiColors;
import org.jline.jansi.AnsiConsole;
import org.jline.jansi.AnsiMode;
import org.jline.jansi.AnsiPrintStream;
import org.jline.jansi.AnsiType;
import org.jline.jansi.io.AnsiOutputStream;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down Expand Up @@ -56,7 +57,6 @@ public void testSystem() {
}

@Test
@SuppressWarnings("deprecation")
public void testTerminalWidth() {
AnsiOutputStream.WidthSupplier width = () -> 33;
AnsiOutputStream aos = new AnsiOutputStream(
Expand All @@ -72,9 +72,11 @@ public void testTerminalWidth() {
false);
try {
AnsiConsole.systemInstall();
AnsiConsole.out = new AnsiPrintStream(aos, true);
Field outField = AnsiConsole.class.getDeclaredField("out");
outField.setAccessible(true);
outField.set(null, new AnsiPrintStream(aos, true));
assertEquals(33, MessageUtils.getTerminalWidth());
} catch (LinkageError e) {
} catch (LinkageError | ReflectiveOperationException e) {
// assumeNoException("JAnsi not supported for this platform", e);
} finally {
try {
Expand Down