Merge branch 'ver/1.17' into ver/purpur-1.17

patches/server/0010-Update-log4j.patch

@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kevin Raneri <kevin.raneri@gmail.com>
+Date: Tue, 14 Dec 2021 14:11:48 -0500
+Subject: [PATCH] Update log4j
+
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 9102d29622f93e824525eeef3420a6aa2b7ebb30..090493ec8d35f3120be90579f653aeb0c9d178b3 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -33,12 +33,12 @@ 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.15.0") // Paper - implementation
+-    annotationProcessor("org.apache.logging.log4j:log4j-core:2.15.0") // Paper - Needed to generate meta for out hex color converter plugin
++    implementation("org.apache.logging.log4j:log4j-core:2.16.0") // Paper - implementation // Pufferfish
++    annotationProcessor("org.apache.logging.log4j:log4j-core:2.16.0") // Paper - Needed to generate meta for out hex color converter plugin // Pufferfish
+     // Paper end
+-    implementation("org.apache.logging.log4j:log4j-iostreams:2.15.0") // Paper
+-    implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.15.0") // Paper
+-    implementation("org.apache.logging.log4j:log4j-api:2.15.0") // Paper
++    implementation("org.apache.logging.log4j:log4j-iostreams:2.16.0") // Paper // Pufferfish
++    implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0") // Paper // Pufferfish
++    implementation("org.apache.logging.log4j:log4j-api:2.16.0") // Paper // Pufferfish
+     implementation("org.ow2.asm:asm:9.2")
+     implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
+     implementation("com.googlecode.json-simple:json-simple:1.1.1") {