diff options
Diffstat (limited to 'Spigot-Server-Patches/0214-update-log4j.patch')
| -rw-r--r-- | Spigot-Server-Patches/0214-update-log4j.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0214-update-log4j.patch b/Spigot-Server-Patches/0214-update-log4j.patch new file mode 100644 index 0000000000..9b27a8bc53 --- /dev/null +++ b/Spigot-Server-Patches/0214-update-log4j.patch @@ -0,0 +1,84 @@ +From 2252af3646587d5f647d9cc831902c0b3bde385f Mon Sep 17 00:00:00 2001 +From: sulu5890 <[email protected]> +Date: Fri, 17 Dec 2021 14:03:18 -0600 +Subject: [PATCH] update log4j + + +diff --git a/pom.xml b/pom.xml +index 34b597caf..e30e7527b 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -38,7 +38,7 @@ + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> +- <version>2.8.1</version> ++ <version>2.17.0</version> <!-- paper - update log4j --> + <scope>compile</scope> + </dependency> + <dependency> +@@ -100,8 +100,8 @@ + <!-- required until fixed plexus-compiler-eclipse is deployed --> + <pluginRepositories> + <pluginRepository> +- <id>spigotmc-public</id> +- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url> ++ <id>papermc</id> <!-- paper - update log4j --> ++ <url>https://papermc.io/repo/repository/maven-public/</url> <!-- paper - update log4j --> + </pluginRepository> + </pluginRepositories> + +@@ -142,6 +142,7 @@ + <Specification-Title>Bukkit</Specification-Title> + <Specification-Version>${api.version}</Specification-Version> + <Specification-Vendor>Bukkit Team</Specification-Vendor> ++ <Multi-Release>true</Multi-Release> <!-- paper - update log4j --> + </manifestEntries> + <manifestSections> + <manifestSection> +@@ -169,7 +170,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> +- <version>2.4.3</version> ++ <version>3.2.4</version> <!-- paper - update log4j --> + <executions> + <execution> + <phase>package</phase> +@@ -177,6 +178,16 @@ + <goal>shade</goal> + </goals> + <configuration> ++ <!-- paper start - update log4j --> ++ <filters> ++ <filter> ++ <artifact>org.spigotmc:minecraft-server:**</artifact> ++ <excludes> ++ <exclude>org/apache/logging/log4j/**</exclude> ++ </excludes> ++ </filter> ++ </filters> ++ <!-- paper end - update log4j --> + <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper --> + <relocations> + <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 --> +diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml +index c99aedb40..20bb83ac0 100644 +--- a/src/main/resources/log4j2.xml ++++ b/src/main/resources/log4j2.xml +@@ -3,10 +3,10 @@ + <Appenders> + <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console> + <Queue name="TerminalConsole"> +- <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" /> ++ <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" /> <!-- paper - update log4j --> + </Queue> + <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz"> +- <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" /> ++ <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" /> <!-- paper - update log4j --> + <Policies> + <TimeBasedTriggeringPolicy /> + <OnStartupTriggeringPolicy /> +-- +2.34.1 + |