Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-06 02:31:46 +01:00
Code Issues Projects Releases Wiki Activity

Various library bumps

Browse Source 
Primarily MySQL, but, also a few logger/console related things
This commit is contained in:
Shane Freeder 2022-05-01 12:34:23 +01:00
parent 2322301e63
commit a44c78a37e
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 69fc7e6667f0ee2d2f30bb049dff9e0ef58f0537 Mon Sep 17 00:00:00 2001 From 247a5fa8aa2977fa0ce1e19e7bb59705cfddd1b7 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200 Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
@ -749,7 +749,7 @@ index e7a492f6..a783d9b0 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index b49b4c5c..ef7fca2c 100644 index b49b4c5c..9d5d939b 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -819,6 +819,15 @@ index b49b4c5c..ef7fca2c 100644
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.27</version>
+ <version>8.0.29</version> <!-- Waterfall - bump -->
<scope>runtime</scope>
</dependency>
<!-- add these back in as they are not exposed by the API -->
diff --git a/query/pom.xml b/query/pom.xml diff --git a/query/pom.xml b/query/pom.xml
index 9e0c4539..081bff62 100644 index 9e0c4539..081bff62 100644
--- a/query/pom.xml --- a/query/pom.xml
@ -861,5 +870,5 @@ index 9e0c4539..081bff62 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.33.0 2.36.0

16
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 54524d2da5ce3339bb6d38a0086fe00359ddad25 Mon Sep 17 00:00:00 2001 From 229256284f51ef81fc9771c0fc7bccb4d65e4c5e Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200 Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -39,7 +39,7 @@ index b3a70840..00ce099c 100644
</build> </build>
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644 new file mode 100644
index 00000000..70f112fd index 00000000..08316eea
--- /dev/null --- /dev/null
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -63,7 +63,7 @@ index 00000000..70f112fd
+ <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description> + <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
+ +
+ <properties> + <properties>
+ <log4j2.version>2.17.1</log4j2.version> + <log4j2.version>2.17.2</log4j2.version>
+ </properties> + </properties>
+ +
+ <dependencies> + <dependencies>
@ -251,7 +251,7 @@ index f371e3dd..505d1d14 100644
</modules> </modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 6fd55644..cca0ef95 100644 index c3ef3c8e..23bfa61d 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
@ -286,18 +286,18 @@ index 6fd55644..cca0ef95 100644
+ <dependency> + <dependency>
+ <groupId>org.slf4j</groupId> + <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId> + <artifactId>slf4j-jdk14</artifactId>
+ <version>1.7.30</version> + <version>1.7.36</version>
+ <scope>compile</scope> + <scope>compile</scope>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>net.minecrell</groupId> + <groupId>net.minecrell</groupId>
+ <artifactId>terminalconsoleappender</artifactId> + <artifactId>terminalconsoleappender</artifactId>
+ <version>1.2.0</version> + <version>1.3.0</version>
+ </dependency> + </dependency>
+ <dependency> + <dependency>
+ <groupId>org.jline</groupId> + <groupId>org.jline</groupId>
+ <artifactId>jline-terminal-jansi</artifactId> + <artifactId>jline-terminal-jansi</artifactId>
+ <version>3.12.1</version> + <version>3.21.0</version>
+ <scope>runtime</scope> + <scope>runtime</scope>
+ </dependency> + </dependency>
+ <!-- Waterfall end --> + <!-- Waterfall end -->
@ -1616,5 +1616,5 @@ index 21a48df6..00000000
- -
-} -}
-- --
2.35.1 2.36.0