Update TerminalConsoleAppender + JLine, use Jansi instead of JNA (#2299)

Remove dependency on JNA since it is no longer needed.
This commit is contained in:
Minecrell
2019-07-24 02:25:05 +02:00
parent bed0039737
commit a4734db50b
2 changed files with 18 additions and 12 deletions

View File

@@ -19,7 +19,7 @@ Other changes:
configuration
diff --git a/pom.xml b/pom.xml
index 04b0dd9a7..54d214a8c 100644
index 04b0dd9a7..58b14a740 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -32,12 +32,12 @@ index 04b0dd9a7..54d214a8c 100644
- <scope>compile</scope>
+ <groupId>net.minecrell</groupId>
+ <artifactId>terminalconsoleappender</artifactId>
+ <version>1.1.1</version>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>4.5.2</version>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-jansi</artifactId>
+ <version>3.12.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!--
@@ -561,6 +561,13 @@ index f267f99f9..000000000
- }
- }
-}
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
new file mode 100644
index 000000000..0694b2146
--- /dev/null
+++ b/src/main/resources/log4j2.component.properties
@@ -0,0 +1 @@
+log4j.skipJansi=true
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 490a9acc7..08b6bb7f9 100644
--- a/src/main/resources/log4j2.xml