3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 11:00:06 +01:00

Merge pull request #892 from Minecrell/tca-1.0.0

Update TerminalConsoleAppender to 1.0.0
Dieser Commit ist enthalten in:
kashike 2017-09-23 11:12:52 -07:00 committet von GitHub
Commit f7de07e2b9
2 geänderte Dateien mit 5 neuen und 16 gelöschten Zeilen

Datei anzeigen

@ -1,4 +1,4 @@
From a49974fc6a244b79944d3ce52a64d9c0da8d4c6c Mon Sep 17 00:00:00 2001 From 357c051b89138fb3d7ef74a0397852830ca9b69c Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200 Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -20,7 +20,7 @@ Other changes:
configuration configuration
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 6a0a02883..3c20c8f34 100644 index 6a0a02883..98972114d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -53,12 +53,6 @@ @@ -53,12 +53,6 @@
@ -36,7 +36,7 @@ index 6a0a02883..3c20c8f34 100644
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
@@ -77,6 +71,38 @@ @@ -77,6 +71,32 @@
<version>3.0.3</version> <version>3.0.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -44,13 +44,7 @@ index 6a0a02883..3c20c8f34 100644
+ <dependency> + <dependency>
+ <groupId>net.minecrell</groupId> + <groupId>net.minecrell</groupId>
+ <artifactId>terminalconsoleappender</artifactId> + <artifactId>terminalconsoleappender</artifactId>
+ <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-jna</artifactId>
+ <version>3.4.0</version>
+ <scope>runtime</scope>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>net.java.dev.jna</groupId> + <groupId>net.java.dev.jna</groupId>
@ -75,7 +69,7 @@ index 6a0a02883..3c20c8f34 100644
<!-- testing --> <!-- testing -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@@ -230,10 +256,18 @@ @@ -230,10 +250,18 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/services/java.sql.Driver</resource> <resource>META-INF/services/java.sql.Driver</resource>
</transformer> </transformer>

Datei anzeigen

@ -40,11 +40,6 @@
<id>aikar</id> <id>aikar</id>
<url>http://ci.emc.gs/nexus/content/groups/aikar/</url> <url>http://ci.emc.gs/nexus/content/groups/aikar/</url>
</repository> </repository>
<repository>
<!-- TODO: Remove when TerminalConsoleAppender is released -->
<id>oss-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories> </repositories>
<distributionManagement> <distributionManagement>