aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0822-Update-Log4j.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
committerShane Freeder <[email protected]>2022-03-02 09:44:22 +0000
commitc6ea84c7fae8d2974820333505a39c7b01c39b90 (patch)
tree0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0822-Update-Log4j.patch
parentd3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff)
downloadPaper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz
Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
Diffstat (limited to 'patches/server/0822-Update-Log4j.patch')
-rw-r--r--patches/server/0822-Update-Log4j.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/server/0822-Update-Log4j.patch b/patches/server/0822-Update-Log4j.patch
new file mode 100644
index 0000000000..1b301675ed
--- /dev/null
+++ b/patches/server/0822-Update-Log4j.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: darbyjack <[email protected]>
+Date: Thu, 9 Dec 2021 19:17:02 -0600
+Subject: [PATCH] Update Log4j
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index a205db80a1a8dbe53130c4148b25163741c33406..4beb35d1e5b013395f5df101e843f41c2ce174ad 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -29,10 +29,11 @@ dependencies {
+ all its classes to check if they are plugins.
+ Scanning takes about 1-2 seconds so adding this speeds up the server start.
+ */
+- 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
++ implementation("org.apache.logging.log4j:log4j-core:2.17.1") // Paper - implementation
++ annotationProcessor("org.apache.logging.log4j:log4j-core:2.17.1") // Paper - Needed to generate meta for our Log4j plugins
+ // Paper end
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
++ implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.17.1") // Paper
+ implementation("org.ow2.asm:asm:9.2")
+ implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")