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

Updated Upstream (BungeeCord)

Browse Source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
2d369e89 Update SnakeYAML version
02548c4b Update Netty/SnakeYAML version
This commit is contained in:
Shane Freeder 2022-10-24 15:38:17 +01:00
parent 31a361174c
commit ff371989bf
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 71990e3ccc16e65f90bc76b38648f9a1d3e9cedb Subproject commit 2d369e894546b3c180ecf931317c6fabff3149c0

10
BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,15 +1,15 @@
From f2b26a8fb95ca8e8cd68638c0c26883f5af6af48 Mon Sep 17 00:00:00 2001 From f1adfb64276cd2b876c75262bde597eae55ab5a5 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net> From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200 Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml diff --git a/api/pom.xml b/api/pom.xml
index 4c87a36e..379b6023 100644 index 863c353e..5d21fd99 100644
--- a/api/pom.xml --- a/api/pom.xml
+++ b/api/pom.xml +++ b/api/pom.xml
@@ -76,5 +76,11 @@ @@ -76,5 +76,11 @@
<version>1.30</version> <version>1.33</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
+ <!-- Waterfall - Add SLF4J --> + <!-- Waterfall - Add SLF4J -->
@ -39,7 +39,7 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not * Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering * be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
index f2623ebe..39e2fa42 100644 index 44bf7f91..fb091698 100644
--- a/log4j/pom.xml --- a/log4j/pom.xml
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -38,6 +38,12 @@ @@ -38,6 +38,12 @@
@ -56,5 +56,5 @@ index f2623ebe..39e2fa42 100644
<groupId>com.lmax</groupId> <groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
-- --
2.33.0 2.38.1

22
BungeeCord-Patches/0066-Bump-netty.patch
View File

@ -1,22 +0,0 @@
From 18e5e71320ba43f2c11d65b6ade5f31e57b62bca Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 28 Aug 2022 00:35:57 +0100
Subject: [PATCH] Bump netty
diff --git a/pom.xml b/pom.xml
index 2b544c23..6810b9cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<properties>
<build.number>unknown</build.number>
<lombok.version>1.18.22</lombok.version>
- <netty.version>4.1.77.Final</netty.version>
+ <netty.version>4.1.80.Final</netty.version> <!-- Waterfall - bump -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--
2.37.2