103 lines
4.4 KiB
Diff
103 lines
4.4 KiB
Diff
|
From 58ba50518555c19119973f40dd18501b31330f39 Mon Sep 17 00:00:00 2001
|
||
|
|
From: sulu5890 <sulu@sulu.me>
|
||
|
|
Date: Fri, 17 Dec 2021 12:53:42 -0600
|
||
|
|
Subject: [PATCH] update log4j
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/pom.xml b/pom.xml
|
||
|
|
index 609000df..644305e6 100644
|
||
|
|
--- a/pom.xml
|
||
|
|
+++ b/pom.xml
|
||
|
|
@@ -44,7 +44,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>
|
||
|
|
@@ -64,7 +64,7 @@
|
||
|
|
<dependency>
|
||
|
|
<groupId>jline</groupId>
|
||
|
|
<artifactId>jline</artifactId>
|
||
|
|
- <version>2.12</version>
|
||
|
|
+ <version>2.12.1</version> <!-- Paper - Update Log4j - use this specific version as it works on both aarch64 and windows -->
|
||
|
|
<type>jar</type>
|
||
|
|
<scope>compile</scope>
|
||
|
|
</dependency>
|
||
|
|
@@ -105,8 +105,8 @@
|
||
|
|
</pluginRepository>
|
||
|
|
<!-- PaperSpigot - Repo for gitdescribe -->
|
||
|
|
<pluginRepository>
|
||
|
|
- <id>destroystokyo</id>
|
||
|
|
- <url>https://ci.destroystokyo.com/plugin/repository/everything/</url>
|
||
|
|
+ <id>papermc</id> <!-- Paper - Update Log4j -->
|
||
|
|
+ <url>https://papermc.io/repo/repository/maven-public/</url> <!-- Paper - Update Log4j -->
|
||
|
|
</pluginRepository>
|
||
|
|
</pluginRepositories>
|
||
|
|
|
||
|
|
@@ -146,6 +146,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>
|
||
|
|
@@ -173,7 +174,7 @@
|
||
|
|
<plugin>
|
||
|
|
<groupId>org.apache.maven.plugins</groupId>
|
||
|
|
<artifactId>maven-shade-plugin</artifactId>
|
||
|
|
- <version>2.3</version>
|
||
|
|
+ <version>3.2.4</version> <!-- Paper - Update Log4j -->
|
||
|
|
<executions>
|
||
|
|
<execution>
|
||
|
|
<phase>package</phase>
|
||
|
|
@@ -181,6 +182,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 -->
|
||
|
|
<relocations>
|
||
|
|
<relocation>
|
||
|
|
<pattern>joptsimple</pattern>
|
||
|
|
@@ -218,7 +229,7 @@
|
||
|
|
<plugin>
|
||
|
|
<groupId>net.md-5</groupId>
|
||
|
|
<artifactId>specialsource-maven-plugin</artifactId>
|
||
|
|
- <version>1.2.1</version>
|
||
|
|
+ <version>1.2.3</version> <!-- paper - bump log4j -->
|
||
|
|
<executions>
|
||
|
|
<execution>
|
||
|
|
<phase>package</phase>
|
||
|
|
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
||
|
|
index 0452fbc0..63cb069f 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
|
||
|
|
|