SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Update netty to 4.1.87

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2023-01-14 19:53:32 +01:00
Ursprung 5aee09dd28
Commit ec9dba85db
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
2 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
patches/server/0003-Build-system-changes.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 40d1dcd4a0870cf002ee6d0309ce667f49a89d35..a2d2c817cdc1798cd30b3a852b3a495bcbe1b91b 100644 index 40d1dcd4a0870cf002ee6d0309ce667f49a89d35..064a0c5b2a4b379ceec84652ff1e004d57419115 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -9,10 +9,9 @@ plugins { @@ -9,10 +9,9 @@ plugins {
@ -26,7 +26,7 @@ index 40d1dcd4a0870cf002ee6d0309ce667f49a89d35..a2d2c817cdc1798cd30b3a852b3a495b
testImplementation("junit:junit:4.13.2") testImplementation("junit:junit:4.13.2")
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
+ +
+ implementation("io.netty:netty-all:4.1.77.Final"); // Paper - Bump netty + implementation("io.netty:netty-all:4.1.87.Final"); // Paper - Bump netty
} }
val craftbukkitPackageVersion = "1_19_R2" // Paper val craftbukkitPackageVersion = "1_19_R2" // Paper

4
patches/server/0847-Add-support-for-Proxy-Protocol.patch
Datei anzeigen

@ -5,14 +5,14 @@ Subject: [PATCH] Add support for Proxy Protocol
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index f9839f17bcda4619c257162e9bf14d5e00053c80..d5d49bb2b47c889e12d17dc87b8c439a60b3fe67 100644 index 9411103b2d68e46ef9889f7a512362a4701486dc..781609605d25283009e5f3e61649ecde9ea9a4cb 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies { @@ -20,6 +20,7 @@ dependencies {
*/ */
implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation
annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins
+ implementation("io.netty:netty-codec-haproxy:4.1.77.Final") // Paper - Add support for proxy protocol + implementation("io.netty:netty-codec-haproxy:4.1.87.Final") // Paper - Add support for proxy protocol
// Paper end // Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
implementation("org.ow2.asm:asm:9.3") implementation("org.ow2.asm:asm:9.3")